From bc8c36b08f6b3d8ffd653242c1658685ea23a1d4 Mon Sep 17 00:00:00 2001
From: fhenry <florian.henry@open-concept.pro>
Date: Mon, 21 Jan 2013 13:48:15 +0100
Subject: [PATCH 001/162] Add parameters force get Extarfield list from
 ll_extrafield even if external extrafield module is enabled

---
 htdocs/webservices/server_actioncomm.php | 4 ++--
 htdocs/webservices/server_thirdparty.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/webservices/server_actioncomm.php b/htdocs/webservices/server_actioncomm.php
index 1e5baa31144..45311cc52d2 100644
--- a/htdocs/webservices/server_actioncomm.php
+++ b/htdocs/webservices/server_actioncomm.php
@@ -291,7 +291,7 @@ function getActionComm($authentication,$id)
 			        	//Retreive all extrafield for actioncomm
 			        	// fetch optionals attributes and labels
 			        	$extrafields=new ExtraFields($db);
-			        	$extralabels=$extrafields->fetch_name_optionals_label('actioncomm');
+			        	$extralabels=$extrafields->fetch_name_optionals_label('actioncomm',true);
 			        	//Get extrafield values
 			        	$actioncomm->fetch_optionals($actioncomm->id,$extralabels);
 
@@ -436,7 +436,7 @@ function createActionComm($authentication,$actioncomm)
 		//Retreive all extrafield for actioncomm
 		// fetch optionals attributes and labels
 		$extrafields=new ExtraFields($db);
-		$extralabels=$extrafields->fetch_name_optionals_label('actioncomm');
+		$extralabels=$extrafields->fetch_name_optionals_label('actioncomm',true);
 		foreach($extrafields->attribute_label as $key=>$label)
 		{
 			$key='options_'.$key;
diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 057a99ac6fa..0735f5880fe 100755
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -123,7 +123,7 @@ $thirdparty_fields= array(
 //Retreive all extrafield for thirdsparty
 // fetch optionals attributes and labels
 $extrafields=new ExtraFields($db);
-$extralabels=$extrafields->fetch_name_optionals_label('company');
+$extralabels=$extrafields->fetch_name_optionals_label('company',true);
 if (count($extrafields)>0) {
 	$extrafield_array = array();
 }
@@ -314,7 +314,7 @@ function getThirdParty($authentication,$id='',$ref='',$ref_ext='')
 				//Retreive all extrafield for thirdsparty
 				// fetch optionals attributes and labels
 				$extrafields=new ExtraFields($db);
-				$extralabels=$extrafields->fetch_name_optionals_label('company');
+				$extralabels=$extrafields->fetch_name_optionals_label('company',true);
 				//Get extrafield values
 				$thirdparty->fetch_optionals($thirdparty->id,$extralabels);
 				
@@ -428,7 +428,7 @@ function createThirdParty($authentication,$thirdparty)
         //Retreive all extrafield for thirdsparty
         // fetch optionals attributes and labels
         $extrafields=new ExtraFields($db);
-        $extralabels=$extrafields->fetch_name_optionals_label('company');
+        $extralabels=$extrafields->fetch_name_optionals_label('company',true);
         foreach($extrafields->attribute_label as $key=>$label)
         {
         	$key='options_'.$key;

From ec7612762553d175e22e072722a17782df367b9e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Jan 2013 15:14:46 +0100
Subject: [PATCH 002/162] Fix:
 http://www.dolibarr.fr/forum/12-howto--aide/28089-adherents--tiers Fix:
 Update member

---
 htdocs/adherents/class/adherent.class.php     |  2 -
 .../install/mysql/migration/3.2.0-3.3.0.sql   |  2 +
 htdocs/install/mysql/tables/llx_adherent.sql  |  1 +
 htdocs/societe/class/societe.class.php        | 51 ++++++++++++++++---
 htdocs/societe/soc.php                        | 18 ++++++-
 5 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index a48c4fb1c0b..ddb434f2868 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -538,8 +538,6 @@ class Adherent extends CommonObject
                         $luser->office_phone=$this->phone;
                         $luser->user_mobile=$this->phone_mobile;
 
-                        $luser->note=$this->note;
-
                         $luser->fk_member=$this->id;
 
                         $result=$luser->update($user,0,1,1);	// Use nosync to 1 to avoid cyclic updates
diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
index 43f397aedf1..3793e822102 100755
--- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
+++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
@@ -20,6 +20,8 @@ DROP TABLE llx_document;
 DROP TABLE llx_dolibarr_modules;
 DROP TABLE llx_product_fournisseur;
 
+ALTER TABLE llx_adherent ADD COLUMN canvas varchar(32);
+
 ALTER TABLE llx_societe_rib MODIFY COLUMN bic varchar(20);
 
 ALTER TABLE llx_facture_rec ADD COLUMN usenewprice        integer;
diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql
index 34550703e28..3ab580b5de2 100644
--- a/htdocs/install/mysql/tables/llx_adherent.sql
+++ b/htdocs/install/mysql/tables/llx_adherent.sql
@@ -60,5 +60,6 @@ create table llx_adherent
   fk_user_author   integer,   -- can be null because member can be create by a guest
   fk_user_mod      integer,
   fk_user_valid    integer,
+  canvas		   varchar(32),			                        -- type of canvas if used (null by default)
   import_key       varchar(14)                  -- Import key
 )ENGINE=innodb;
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 9c2368f3f36..8dbebff7da8 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -375,9 +375,10 @@ class Societe extends CommonObject
      *		@param	int		$allowmodcodeclient			Inclut modif code client et code compta
      *		@param	int		$allowmodcodefournisseur	Inclut modif code fournisseur et code compta fournisseur
      *		@param	string	$action						'create' or 'update'
+     *		@param	int		$nosyncmember				Do not synchronize info of linked member
      *      @return int  			           			<0 if KO, >=0 if OK
      */
-    function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0, $action='update')
+    function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0, $action='update', $nosyncmember=1)
     {
         global $langs,$conf;
         require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -491,7 +492,7 @@ class Societe extends CommonObject
 
         if ($result >= 0)
         {
-            dol_syslog(get_class($this)."::Update verify ok");
+            dol_syslog(get_class($this)."::update verify ok");
 
             $sql  = "UPDATE ".MAIN_DB_PREFIX."societe SET ";
             $sql .= "nom = '" . $this->db->escape($this->name) ."'"; // Required
@@ -564,11 +565,49 @@ class Societe extends CommonObject
             $resql=$this->db->query($sql);
             if ($resql)
             {
-                unset($this->country_code);		// We clean this because it may have been changed after an update of country_id
-                unset($this->country);
-                unset($this->state_code);
-                unset($this->state);
+            	unset($this->country_code);		// We clean this because it may have been changed after an update of country_id
+            	unset($this->country);
+            	unset($this->state_code);
+            	unset($this->state);
+
+            	$nbrowsaffected+=$this->db->affected_rows($resql);
 
+            	if (! $error && $nbrowsaffected)
+            	{
+            		// Update information on linked member if it is an update
+	            	if (! $nosyncmember && ! empty($conf->adherent->enabled))
+	            	{
+		            	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+		            	
+		            	dol_syslog(get_class($this)."::update update linked member");
+		            	
+		            	$lmember=new Adherent($this->db);
+		            	$result=$lmember->fetch(0, 0, $this->id);
+		            	
+		            	if ($result > 0)
+		            	{
+		            		$lmember->firstname=$this->firstname;
+		            		$lmember->lastname=$this->lastname;
+		            		$lmember->address=$this->address;
+		            		$lmember->email=$this->email;
+		            		$lmember->phone=$this->phone;
+
+		            		$result=$lmember->update($user,0,1,1);	// Use nosync to 1 to avoid cyclic updates
+		            		if ($result < 0)
+		            		{
+		            			$this->error=$lmember->error;
+		            			dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
+		            			$error++;
+		            		}
+		            	}
+		            	else if ($result < 0)
+		            	{
+		            		$this->error=$lmember->error;
+		            		$error++;
+		            	}            	
+	            	}
+            	}
+            	
                 // Si le fournisseur est classe on l'ajoute
                 $this->AddFournisseurInCategory($this->fournisseur_categorie);
 
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 8514ac0db62..063d33a27f3 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -346,7 +346,7 @@ if (empty($reshook))
                 if (empty($object->fournisseur)&& empty($object->oldcopy->code_fournisseur)) $object->code_fournisseur='';
                 //var_dump($object);exit;
 
-                $result = $object->update($socid,$user,1,$object->oldcopy->codeclient_modifiable(),$object->oldcopy->codefournisseur_modifiable());
+                $result = $object->update($socid, $user, 1, $object->oldcopy->codeclient_modifiable(), $object->oldcopy->codefournisseur_modifiable(), 'update', 0);
                 if ($result <=  0)
                 {
                     $error = $object->error; $errors = $object->errors;
@@ -397,6 +397,22 @@ if (empty($reshook))
                 }
                 // Gestion du logo de la société
 
+                
+                // Update linked member
+                if (! $error && $object->fk_soc > 0)
+                {
+                	
+                	$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
+                	$sql.= " SET fk_soc = NULL WHERE fk_soc = " . $id;
+                	dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+                	if (! $this->db->query($sql))
+                	{
+                		$error++;
+                		$this->error .= $this->db->lasterror();
+                		dol_syslog(get_class($this)."::delete erreur -1 ".$this->error, LOG_ERR);
+                	}
+                }
+                
                 if (! $error && ! count($errors))
                 {
 

From 910543c5b9446f13ca82d649623d2eafba9ed73e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Tue, 22 Jan 2013 16:53:39 +0100
Subject: [PATCH 003/162] Fix: broken feature

---
 htdocs/core/class/commonobject.class.php | 10 +++++-----
 htdocs/core/class/hookmanager.class.php  |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 8194474ff6c..d77b7487e1e 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2279,16 +2279,16 @@ abstract class CommonObject
             	$qty= $obj->qty;
             	$discount_percent_line = $obj->remise_percent;
             	$total_ht = $obj->total_ht;
-            	
+
         		$total_discount_line = price2num(($pu_ht * $qty) - $total_ht, 'MT');
         		$total_discount += $total_discount_line;
-        		
+
         		$i++;
         	}
         }
         else dol_syslog(get_class($this).'::getTotalDiscount '.$this->db->lasterror(), LOG_ERR);
-		
-        //print $total_discount; exit;        
+
+        //print $total_discount; exit;
         return price2num($total_discount);
     }
 
@@ -2479,7 +2479,7 @@ abstract class CommonObject
         $parameters=array();
         $reshook=$hookmanager->executeHooks('showLinkedObjectBlock',$parameters,$this,$action);    // Note that $action and $object may have been modified by hook
 
-        if (! $reshook)
+        if (empty($hookmanager->resPrint))
         {
         	$num = count($this->linkedObjects);
 
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index b5598689e0f..8b0ac34b6e2 100755
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -41,6 +41,8 @@ class HookManager
 
 	// Array result
 	var $resArray=array();
+	// Printable result (int, string)
+	var $resPrint;
 
 	/**
 	 * Constructor

From b0c11373978867eec537cb53ae71e15339e8206a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 22 Jan 2013 17:43:41 +0100
Subject: [PATCH 004/162] Restore correct code: A module decide if standard
 code is used or not after running by a return code that is an int 0=execute
 standard code, 1=disable standard code

To return a string to show or an array or error codes, this must be done
by setting
$actionclassinstance->results
or
$actionclassinstance->resprints
---
 htdocs/core/class/commonobject.class.php | 2 +-
 htdocs/core/class/hookmanager.class.php  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index d77b7487e1e..34a68f58fc4 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2479,7 +2479,7 @@ abstract class CommonObject
         $parameters=array();
         $reshook=$hookmanager->executeHooks('showLinkedObjectBlock',$parameters,$this,$action);    // Note that $action and $object may have been modified by hook
 
-        if (empty($hookmanager->resPrint))
+        if (empty($reshook))
         {
         	$num = count($this->linkedObjects);
 
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 8b0ac34b6e2..c6e5895f450 100755
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -41,8 +41,8 @@ class HookManager
 
 	// Array result
 	var $resArray=array();
-	// Printable result (int, string)
-	var $resPrint;
+	// Printable result
+	var $resPrint='';
 
 	/**
 	 * Constructor

From a019b1c854f32c0afc0b3f60eb384f8632a8aa0d Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Tue, 22 Jan 2013 18:04:04 +0100
Subject: [PATCH 005/162] Fix: disable "datetimepicker" from edit in place for
 the moment

---
 htdocs/core/class/html.form.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index bd6f11d0e40..6e331bc0a0e 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -135,8 +135,7 @@ class Form
         $ret='';
 
         // When option to edit inline is activated
-        // TODO change for compatibility
-        if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! preg_match('/^select;/',$typeofdata))
+        if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! preg_match('/^select;|datehourpicker/',$typeofdata)) // FIXME add jquery timepicker
         {
             $ret.=$this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $success);
         }

From 06a0da990be4889d1c4adbe15ca693905913569c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Tue, 22 Jan 2013 21:35:15 +0100
Subject: [PATCH 006/162] Fix: broken features, special_code also used by
 externals modules !

---
 htdocs/comm/propal/class/propal.class.php     |  8 +++---
 htdocs/commande/class/commande.class.php      | 10 ++++---
 htdocs/compta/facture/class/facture.class.php | 26 ++++++++++---------
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 8b481885b2e..8e3e4748f05 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004      Eric Seigne				<eric.seigne@ryxeo.com>
  * Copyright (C) 2004-2011 Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005      Marc Barilley			<marc@ocebo.com>
- * Copyright (C) 2005-2012 Regis Houssin			<regis.houssin@capnetworks.com>
+ * 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>
@@ -301,7 +301,7 @@ class Propal extends CommonObject
      * 		@param    	int			$info_bits			Bits de type de lignes
      *      @param      int			$type               Type of line (product, service)
      *      @param      int			$rang               Position of line
-     *      @param		int			$special_code		Special code
+     *      @param		int			$special_code		Special code (also used by externals modules!)
      *      @param		int			$fk_parent_line		Id of parent line
      *      @param		int			$fk_fournprice		Id supplier price
      *      @param		int			$pa_ht				Buying price without tax
@@ -457,7 +457,7 @@ class Propal extends CommonObject
      *  @param      string		$desc            	Description
      *	@param	  	double		$price_base_type	HT ou TTC
      *	@param      int			$info_bits        	Miscellanous informations
-     *	@param      int			$special_code      	Set special code ('' = we don't change it)
+     *	@param		int			$special_code		Special code (also used by externals modules!)
      * 	@param		int			$fk_parent_line		Id of parent line (0 in most cases, used by modules adding sublevels into lines).
      * 	@param		int			$skip_update_total	Keep fields total_xxx to 0 (used for special lines by some modules)
      *  @param		int			$fk_fournprice		Id of origin supplier price
@@ -480,7 +480,7 @@ class Propal extends CommonObject
         $txtva = price2num($txtva);
         $txlocaltax1=price2num($txlocaltax1);
         $txlocaltax2=price2num($txlocaltax2);
-    		$pa_ht=price2num($pa_ht);
+    	$pa_ht=price2num($pa_ht);
         if (empty($qty) && empty($special_code)) $special_code=3;    // Set option tag
         if (! empty($qty) && $special_code == 3) $special_code=0;    // Remove option tag
 
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 6b6834539ad..481b51400a5 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2010-2012 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2011      Jean Heimburger      <jean@tiaris.info>
@@ -995,7 +995,7 @@ class Commande extends CommonOrder
      *	@param      timestamp		$date_end         	End date of the line - Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)
      *	@param      int				$type				Type of line (0=product, 1=service)
      *	@param      int				$rang             	Position of line
-     *	@param		int				$special_code		Special code
+     *	@param		int				$special_code		Special code (also used by externals modules!)
      *	@param		int				$fk_parent_line		Parent line
      *  @param		int				$fk_fournprice		Id supplier price
      *  @param		int				$pa_ht				Buying price (without tax)
@@ -2176,9 +2176,10 @@ class Commande extends CommonOrder
      *  @param		int				$fk_fournprice		Id of origin supplier price
      *  @param		int				$pa_ht				Price (without tax) of product when it was bought
      *  @param		string			$label				Label
+     *  @param		int				$special_code		Special code (also used by externals modules!)
      *  @return   	int              					< 0 if KO, > 0 if OK
      */
-	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0,$txlocaltax2=0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='')
+	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0,$txlocaltax2=0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0)
     {
         global $conf;
 
@@ -2197,6 +2198,7 @@ class Commande extends CommonOrder
             if (empty($txlocaltax2)) $txlocaltax2=0;
             if (empty($remise)) $remise=0;
             if (empty($remise_percent)) $remise_percent=0;
+            if (empty($special_code) || $special_code == 3) $special_code=0;
             $remise_percent=price2num($remise_percent);
             $qty=price2num($qty);
             $pu = price2num($pu);
@@ -2251,7 +2253,7 @@ class Commande extends CommonOrder
             $this->line->remise_percent=$remise_percent;
             $this->line->subprice=$subprice;
             $this->line->info_bits=$info_bits;
-            $this->line->special_code=0;	// To remove special_code=3 coming from proposals copy
+            $this->line->special_code=$special_code;
             $this->line->total_ht=$total_ht;
             $this->line->total_tva=$total_tva;
             $this->line->total_localtax1=$total_localtax1;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 8c194245015..cf7b89be7aa 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004      Sebastien Di Cintio   <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier        <benoit.mortier@opensides.be>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2013 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.fr>
  * Copyright (C) 2007      Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
  * Copyright (C) 2010-2012 Juanjo Menent         <jmenent@2byte.es>
@@ -1874,7 +1874,7 @@ class Facture extends CommonInvoice
      * 		@param    	double		$pu_ttc             Prix unitaire TTC (> 0 even for credit note)
      * 		@param		int			$type				Type of line (0=product, 1=service)
      *      @param      int			$rang               Position of line
-     *      @param		int			$special_code		Special code
+     *      @param		int			$special_code		Special code (also used by externals modules!)
      *      @param		string		$origin				'order', ...
      *      @param		int			$origin_id			Id of origin object
      *      @param		int			$fk_parent_line		Id of parent line
@@ -2037,9 +2037,10 @@ class Facture extends CommonInvoice
      * 	@param		int			$fk_fournprice		Id of origin supplier price
      * 	@param		int			$pa_ht				Price (without tax) of product when it was bought
      * 	@param		string		$label				Label of the line
+     * 	@param		int			$special_code		Special code (also used by externals modules!)
      *  @return    	int             				< 0 if KO, > 0 if OK
      */
-    function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='')
+    function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0)
     {
         include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
@@ -2052,11 +2053,12 @@ class Facture extends CommonInvoice
             // Clean parameters
             if (empty($qty)) $qty=0;
             if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line=0;
+            if (empty($special_code) || $special_code == 3) $special_code=0;
 
             $remise_percent	= price2num($remise_percent);
             $qty			= price2num($qty);
             $pu 			= price2num($pu);
-            $pa_ht    = price2num($pa_ht);
+            $pa_ht			= price2num($pa_ht);
             $txtva			= price2num($txtva);
             $txlocaltax1	= price2num($txlocaltax1);
             $txlocaltax2	= price2num($txlocaltax2);
@@ -2105,21 +2107,21 @@ class Facture extends CommonInvoice
             $this->line->rowid				= $rowid;
             $this->line->label				= $label;
             $this->line->desc				= $desc;
-            $this->line->qty=            ($this->type==2?abs($qty):$qty);	// For credit note, quantity is always positive and unit price negative
+            $this->line->qty				= ($this->type==2?abs($qty):$qty);	// For credit note, quantity is always positive and unit price negative
             $this->line->tva_tx				= $txtva;
             $this->line->localtax1_tx		= $txlocaltax1;
             $this->line->localtax2_tx		= $txlocaltax2;
             $this->line->remise_percent		= $remise_percent;
-            $this->line->subprice=       ($this->type==2?-abs($pu_ht):$pu_ht); // For credit note, unit price always negative, always positive otherwise
+            $this->line->subprice			= ($this->type==2?-abs($pu_ht):$pu_ht); // For credit note, unit price always negative, always positive otherwise
             $this->line->date_start			= $date_start;
             $this->line->date_end			= $date_end;
-            $this->line->total_ht=       (($this->type==2||$qty<0)?-abs($total_ht):$total_ht);  // For credit note and if qty is negative, total is negative
-            $this->line->total_tva=      (($this->type==2||$qty<0)?-abs($total_tva):$total_tva);
-            $this->line->total_localtax1=(($this->type==2||$qty<0)?-abs($total_localtax1):$total_localtax1);
-            $this->line->total_localtax2=(($this->type==2||$qty<0)?-abs($total_localtax2):$total_localtax2);
-            $this->line->total_ttc=      (($this->type==2||$qty<0)?-abs($total_ttc):$total_ttc);
+            $this->line->total_ht			= (($this->type==2||$qty<0)?-abs($total_ht):$total_ht);  // For credit note and if qty is negative, total is negative
+            $this->line->total_tva			= (($this->type==2||$qty<0)?-abs($total_tva):$total_tva);
+            $this->line->total_localtax1	= (($this->type==2||$qty<0)?-abs($total_localtax1):$total_localtax1);
+            $this->line->total_localtax2	= (($this->type==2||$qty<0)?-abs($total_localtax2):$total_localtax2);
+            $this->line->total_ttc			= (($this->type==2||$qty<0)?-abs($total_ttc):$total_ttc);
             $this->line->info_bits			= $info_bits;
-            $this->line->special_code=0;	// To remove special_code=3 coming from proposals copy
+            $this->line->special_code		= $special_code;
             $this->line->product_type		= $type;
             $this->line->fk_parent_line		= $fk_parent_line;
             $this->line->skip_update_total	= $skip_update_total;

From 5f2af003977831539a5b495e883b9865de710271 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jan 2013 00:24:20 +0100
Subject: [PATCH 007/162] Add logs to debug

---
 htdocs/core/class/hookmanager.class.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index c6e5895f450..753086339fb 100755
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -117,7 +117,7 @@ class HookManager
      * 		@param		Object	&$object		Object to use hooks on
      * 	    @param		string	&$action		Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
      * 		@return		mixed					For doActions,formObjectOptions:    Return 0 if we want to keep standard actions, >0 if if want to stop standard actions, <0 means KO.
-     * 											For printSearchForm,printLeftBlock,printTopRightMenu,formAddObjectLine,...: Return HTML string. TODO Must always return an int and things to print into ->resprints. 
+     * 											For printSearchForm,printLeftBlock,printTopRightMenu,formAddObjectLine,...: Return HTML string. TODO Must always return an int and things to print into ->resprints.
      *                                          Can also return some values into an array ->results.
      * 											$this->error or this->errors are also defined by class called by this function if error.
      */
@@ -176,11 +176,13 @@ class HookManager
                     	// TODO. remove this. result must not be a string. we must use $actionclassinstance->resprint to return a string
                     	if (! is_array($result) && ! is_numeric($result)) $this->resPrint.=$result;
                     }
+
+                    //print "method=".$method." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." result=".$result." resaction=".$resaction;
                 }
             }
         }
 
-        if ($method != 'doActions' && $method != 'formObjectOptions') return $this->resPrint;	// TODO remove this. When there is something to print, ->resPrint is filled. 
+        if ($method != 'doActions' && $method != 'formObjectOptions') return $this->resPrint;	// TODO remove this. When there is something to print, ->resPrint is filled.
         return ($error?-1:$resaction);
 	}
 

From c66c02e74595bcbfc946cfa715b159513e115727 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 23 Jan 2013 11:28:11 +0100
Subject: [PATCH 008/162] Fix: missing files library

---
 htdocs/fourn/commande/fiche.php | 5 +++--
 htdocs/fourn/facture/fiche.php  | 9 ++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 348f296ff89..36643547088 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -36,9 +36,10 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (! empty($conf->produit->enabled))
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+if (!empty($conf->produit->enabled))
 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (! empty($conf->projet->enabled))
+if (!empty($conf->projet->enabled))
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 $langs->load('orders');
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index f2ee3749897..99e1bf5da0a 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2012	Laurent Destailleur 	<eldy@users.sourceforge.net>
  * Copyright (C) 2004		Christophe Combelles	<ccomb@free.fr>
  * Copyright (C) 2005		Marc Barilley			<marc@ocebo.fr>
- * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2013	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2010-2012	Juanjo Menent			<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -33,8 +33,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefo
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+if (!empty($conf->produit->enabled))
+	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+if (!empty($conf->projet->enabled))
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 
 $langs->load('bills');

From 7b1e15f340c19356c5868d7671e5a1a1b187120e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jan 2013 14:51:15 +0100
Subject: [PATCH 009/162] New: Allow to use upgrade script to upgrade sql of
 modules

---
 htdocs/install/upgrade.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 92d7f9b1eff..28aea7628e9 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -46,6 +46,7 @@ $setuplang=GETPOST("selectlang",'',3)?GETPOST("selectlang",'',3):'auto';
 $langs->setDefaultLang($setuplang);
 $versionfrom=GETPOST("versionfrom",'',3)?GETPOST("versionfrom",'',3):(empty($argv[1])?'':$argv[1]);
 $versionto=GETPOST("versionto",'',3)?GETPOST("versionto",'',3):(empty($argv[2])?'':$argv[2]);
+$versionmodule=GETPOST("versionmodule",'',3)?GETPOST("versionmodule",'',3):(empty($argv[3])?'':$argv[3]);
 
 $langs->load("admin");
 $langs->load("install");
@@ -319,8 +320,9 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action')))
     if ($ok)
     {
         $dir = "mysql/migration/";		// We use mysql migration scripts whatever is database driver
+		if (! empty($versionmodule)) $dir=dol_buildpath('/'.$versionmodule.'/sql/',0);
 
-        // For minor version
+		// For minor version
         $newversionfrom=preg_replace('/(\.[0-9]+)$/i','.0',$versionfrom);
         $newversionto=preg_replace('/(\.[0-9]+)$/i','.0',$versionto);
 
@@ -387,7 +389,7 @@ $ret=0;
 if (! $ok && isset($argv[1])) $ret=1;
 dol_syslog("Exit ".$ret);
 
-pFooter(! $ok && empty($_GET["ignoreerrors"]),$setuplang);
+pFooter(((! $ok && empty($_GET["ignoreerrors"])) || $versionmodule),$setuplang);
 
 if ($db->connected) $db->close();
 

From b12101a650545e78cf024ea66699c936228c56f6 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 23 Jan 2013 15:11:33 +0100
Subject: [PATCH 010/162] Fix: only once superadmin if no multicompany setup

---
 htdocs/user/fiche.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 52ca3932fdb..095a14ab439 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -223,10 +223,6 @@ if ($action == 'add' && $canadduser)
         		$object->entity = (empty($_POST["entity"]) ? 0 : $_POST["entity"]);
         	}
         }
-        else if (! empty($_POST["admin"]))
-        {
-        	$object->entity=0;
-        }
         else
         {
         	$object->entity = (empty($_POST["entity"]) ? 0 : $_POST["entity"]);
@@ -372,10 +368,6 @@ if ($action == 'update' && ! $_POST["cancel"])
             		$object->entity = (empty($_POST["entity"]) ? 0 : $_POST["entity"]);
             	}
             }
-            else if(! empty($_POST["admin"]))
-            {
-            	$object->entity=0;
-            }
             else
             {
             	$object->entity = (empty($_POST["entity"]) ? 0 : $_POST["entity"]);
@@ -1582,7 +1574,7 @@ else
             print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
+            print '<input type="hidden" name="entity" value="'.$fuser->entity.'">';
             print '<table width="100%" class="border">';
 
             $rowspan=13;

From 459adb146c00568f5de839e6b9eb0db98fdc983b Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 23 Jan 2013 15:26:18 +0100
Subject: [PATCH 011/162] Fix: only once superadmin and an admin can not
 delete/modify a superadmin

---
 htdocs/user/fiche.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 095a14ab439..49a38c90f39 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -1360,7 +1360,7 @@ else
 
             print '<div class="tabsAction">';
 
-            if ($caneditfield && (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            if ($caneditfield && ((empty($conf->multicompany->enabled) && $fuser->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
                 {
@@ -1372,7 +1372,7 @@ else
                 }
             }
             elseif ($caneditpassword && ! $object->ldap_sid &&
-            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            ((empty($conf->multicompany->enabled) && $fuser->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("EditPassword").'</a>';
             }
@@ -1385,7 +1385,7 @@ else
 	                print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("ReinitPassword").'</a>';
 				}
                 elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
-                (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+                ((empty($conf->multicompany->enabled) && $fuser->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
                 {
                     print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=password">'.$langs->trans("ReinitPassword").'</a>';
                 }
@@ -1395,7 +1395,7 @@ else
 	                print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("SendNewPassword").'</a>';
 				}
                 else if (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
-                (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+                ((empty($conf->multicompany->enabled) && $fuser->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
                 {
                     if ($object->email) print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a>';
                     else print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendNewPassword").'</a>';
@@ -1404,19 +1404,19 @@ else
 
             // Activer
             if ($user->id <> $id && $candisableuser && $object->statut == 0 &&
-            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            ((empty($conf->multicompany->enabled) && $fuser->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=enable">'.$langs->trans("Reactivate").'</a>';
             }
             // Desactiver
             if ($user->id <> $id && $candisableuser && $object->statut == 1 &&
-            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            ((empty($conf->multicompany->enabled) && $fuser->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 print '<a class="butActionDelete" href="fiche.php?action=disable&amp;id='.$object->id.'">'.$langs->trans("DisableUser").'</a>';
             }
             // Delete
             if ($user->id <> $id && $candisableuser &&
-            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            ((empty($conf->multicompany->enabled) && $fuser->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
             	if ($user->admin || ! $object->admin) // If user edited is admin, delete is possible on for an admin
             	{

From beea9c2ec4bbfffcf0402ebf2d58e6a227d2e7a7 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 23 Jan 2013 15:44:51 +0100
Subject: [PATCH 012/162] Fix: use the users entity

---
 htdocs/user/fiche.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 49a38c90f39..912783d9ca9 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -1360,7 +1360,7 @@ else
 
             print '<div class="tabsAction">';
 
-            if ($caneditfield && ((empty($conf->multicompany->enabled) && $fuser->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            if ($caneditfield && ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
                 {
@@ -1368,13 +1368,13 @@ else
                 }
                 else
                 {
-                    print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
+                    print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
                 }
             }
             elseif ($caneditpassword && ! $object->ldap_sid &&
-            ((empty($conf->multicompany->enabled) && $fuser->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
-                print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("EditPassword").'</a>';
+                print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("EditPassword").'</a>';
             }
 
             // Si on a un gestionnaire de generation de mot de passe actif
@@ -1385,9 +1385,9 @@ else
 	                print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("ReinitPassword").'</a>';
 				}
                 elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
-                ((empty($conf->multicompany->enabled) && $fuser->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+                ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
                 {
-                    print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=password">'.$langs->trans("ReinitPassword").'</a>';
+                    print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=password">'.$langs->trans("ReinitPassword").'</a>';
                 }
 
 				if ($object->statut == 0)
@@ -1395,32 +1395,32 @@ else
 	                print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("SendNewPassword").'</a>';
 				}
                 else if (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
-                ((empty($conf->multicompany->enabled) && $fuser->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+                ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
                 {
-                    if ($object->email) print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a>';
+                    if ($object->email) print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a>';
                     else print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendNewPassword").'</a>';
                 }
             }
 
             // Activer
             if ($user->id <> $id && $candisableuser && $object->statut == 0 &&
-            ((empty($conf->multicompany->enabled) && $fuser->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
-                print '<a class="butAction" href="fiche.php?id='.$object->id.'&amp;action=enable">'.$langs->trans("Reactivate").'</a>';
+                print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=enable">'.$langs->trans("Reactivate").'</a>';
             }
             // Desactiver
             if ($user->id <> $id && $candisableuser && $object->statut == 1 &&
-            ((empty($conf->multicompany->enabled) && $fuser->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
-                print '<a class="butActionDelete" href="fiche.php?action=disable&amp;id='.$object->id.'">'.$langs->trans("DisableUser").'</a>';
+                print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&amp;id='.$object->id.'">'.$langs->trans("DisableUser").'</a>';
             }
             // Delete
             if ($user->id <> $id && $candisableuser &&
-            ((empty($conf->multicompany->enabled) && $fuser->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
             	if ($user->admin || ! $object->admin) // If user edited is admin, delete is possible on for an admin
             	{
-                	print '<a class="butActionDelete" href="fiche.php?action=delete&amp;id='.$object->id.'">'.$langs->trans("DeleteUser").'</a>';
+                	print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("DeleteUser").'</a>';
             	}
             	else
             	{
@@ -1574,7 +1574,7 @@ else
             print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="entity" value="'.$fuser->entity.'">';
+            print '<input type="hidden" name="entity" value="'.$object->entity.'">';
             print '<table width="100%" class="border">';
 
             $rowspan=13;

From 5e42a9ff8aa93c9fc931843acb47c2158bf358b3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jan 2013 18:08:11 +0100
Subject: [PATCH 013/162] Fix: Revert again another fix that was not correct.
 It was no more possible to edit a user even if user has permission for. If
 module multicompany does not exists (standard mode), no other test must be
 added to the if, except the $canxxx test.

---
 htdocs/user/fiche.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 912783d9ca9..bc0caf8d469 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -1360,7 +1360,7 @@ else
 
             print '<div class="tabsAction">';
 
-            if ($caneditfield && ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            if ($caneditfield && (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
                 {
@@ -1372,7 +1372,7 @@ else
                 }
             }
             elseif ($caneditpassword && ! $object->ldap_sid &&
-            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("EditPassword").'</a>';
             }
@@ -1385,7 +1385,7 @@ else
 	                print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("ReinitPassword").'</a>';
 				}
                 elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
-                ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+                (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
                 {
                     print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=password">'.$langs->trans("ReinitPassword").'</a>';
                 }
@@ -1395,7 +1395,7 @@ else
 	                print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("SendNewPassword").'</a>';
 				}
                 else if (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
-                ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+                (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
                 {
                     if ($object->email) print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a>';
                     else print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendNewPassword").'</a>';
@@ -1404,19 +1404,19 @@ else
 
             // Activer
             if ($user->id <> $id && $candisableuser && $object->statut == 0 &&
-            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=enable">'.$langs->trans("Reactivate").'</a>';
             }
             // Desactiver
             if ($user->id <> $id && $candisableuser && $object->statut == 1 &&
-            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&amp;id='.$object->id.'">'.$langs->trans("DisableUser").'</a>';
             }
             // Delete
             if ($user->id <> $id && $candisableuser &&
-            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
             	if ($user->admin || ! $object->admin) // If user edited is admin, delete is possible on for an admin
             	{

From 7fcf206603235a1e4d45a2b452f3673c9518e396 Mon Sep 17 00:00:00 2001
From: fhenry <florian.henry@open-concept.pro>
Date: Wed, 23 Jan 2013 19:46:28 +0100
Subject: [PATCH 014/162] Add SparkAngel Support for Open-concept.pro

---
 htdocs/support/online.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/htdocs/support/online.php b/htdocs/support/online.php
index b9551c0251f..bd431b0fe68 100644
--- a/htdocs/support/online.php
+++ b/htdocs/support/online.php
@@ -72,6 +72,12 @@ array('name'=>'Auguria',
 		'sort'=>2,
 		//'logo'=>'logoUrl='.urlencode('http://www.cap-networks.com/images/logo_small.jpg'),
 		'id'=>'7196',
+		'lang'=>'fr'),
+//Widget for Open-Concept
+array('name'=>'Open-Concept.pro',
+		'sort'=>2,
+		'logo'=>'logoUrl='.urlencode('http://www.open-concept.pro/CMS/images/Logo/logosimplecomplet.png'),
+		'id'=>'9340',
 		'lang'=>'fr')
 );
 $arrayofwidgets=dol_sort_array($arrayofwidgets,'sort','asc',0,0);

From efadc2c75c2c29ef6f9905d52aff416a018504d5 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Wed, 23 Jan 2013 21:04:41 +0100
Subject: [PATCH 015/162] Fix: remove unused support

---
 htdocs/support/online.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/htdocs/support/online.php b/htdocs/support/online.php
index bd431b0fe68..33b18af7924 100644
--- a/htdocs/support/online.php
+++ b/htdocs/support/online.php
@@ -61,12 +61,6 @@ array('name'=>'Laurent Destailleur',	// id user 4702
 		'logo'=>'logoUrl='.urlencode('http://www.nltechno.com/images/logo_nltechno_long.jpg'), // Put your own logo
 		'id'=>'4256,4255',	// Put of list of sparkangels widget id (for each language)
 		'lang'=>'fr,en'),	// Put list of language code of widgets (always english at end)
-// Widget for Regis Houssin
-array('name'=>'R&eacute;gis Houssin',
-		'sort'=>2,
-		'logo'=>'logoUrl='.urlencode('http://www.cap-networks.com/images/logo_small.jpg'),
-		'id'=>'5391',
-		'lang'=>'fr'),
 // Widget for Auguria
 array('name'=>'Auguria',
 		'sort'=>2,

From 347228270398b4793abe08de51ee6c5b3b0a78bc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 23 Jan 2013 23:34:43 +0100
Subject: [PATCH 016/162] Fix: [ bug #667 ] Customer categories wrong tree
 shown after update 3.2->3.3

---
 htdocs/categories/class/categorie.class.php | 104 ++++++++++++--------
 htdocs/categories/index.php                 |   3 +
 htdocs/ecm/class/ecmdirectory.class.php     |   4 +-
 3 files changed, 69 insertions(+), 42 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 6daa65f4893..802e8e3ff11 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -47,6 +47,7 @@ class Categorie
 	var $import_key;
 
 	var $cats=array();			// Tableau en memoire des categories
+	var $motherof=array();
 
 
 	/**
@@ -542,6 +543,40 @@ class Categorie
 		return ($n[0] > 0);
 	}
 
+
+	/**
+	 * 	Load this->motherof that is array(id_son=>id_parent, ...)
+	 *
+	 *	@return		int		<0 if KO, >0 if OK
+	 */
+	private function load_motherof()
+	{
+		global $conf;
+
+		$this->motherof=array();
+
+		// Load array[child]=parent
+		$sql = "SELECT fk_parent as id_parent, rowid as id_son";
+		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
+		$sql.= " WHERE fk_parent != 0";
+		$sql.= " AND entity = ".$conf->entity;
+
+		dol_syslog(get_class($this)."::load_motherof sql=".$sql);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			while ($obj= $this->db->fetch_object($resql))
+			{
+				$this->motherof[$obj->id_son]=$obj->id_parent;
+			}
+			return 1;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
 
 	/**
 	 * 	Reconstruit l'arborescence des categories sous la forme d'un tableau
@@ -554,13 +589,16 @@ class Categorie
 	 *				fullpath = chemin complet compose des id
 	 *
 	 *	@param      string	$type		      Type of categories (0=product, 1=suppliers, 2=customers, 3=members)
-     *  @param      int		$markafterid      Mark all categories after this leaf in category tree.
-	 *	@return		array		      		  Array of categories
+     *  @param      int		$markafterid      Removed all categories including the leaf $markafterid in category tree.
+	 *	@return		array		      		  Array of categories. this->cats and this->motherof are set.
 	 */
 	function get_full_arbo($type,$markafterid=0)
 	{
 		$this->cats = array();
 
+		// Init this->motherof that is array(id_son=>id_parent, ...)
+		$this->load_motherof();
+
 		// Init $this->cats array
 		$sql = "SELECT DISTINCT c.rowid, c.label, c.description, c.fk_parent";	// Distinct reduce pb with old tables with duplicates
 		$sql.= " FROM ".MAIN_DB_PREFIX."categorie as c";
@@ -592,10 +630,11 @@ class Categorie
 		dol_syslog(get_class($this)."::get_full_arbo call to build_path_from_id_categ", LOG_DEBUG);
 		foreach($this->cats as $key => $val)
 		{
+			//print 'key='.$key.'<br>'."\n";
 			$this->build_path_from_id_categ($key,0);	// Process a branch from the root category key (this category has no parent)
 		}
 
-        // Exclude tree for $markafterid
+        // Exclude leaf including $markafterid from tree
         if ($markafterid)
         {
             //print "Look to discard category ".$markafterid."\n";
@@ -608,8 +647,6 @@ class Categorie
                 if (preg_match('/'.$keyfilter1.'/',$val['fullpath']) || preg_match('/'.$keyfilter2.'/',$val['fullpath'])
                 || preg_match('/'.$keyfilter3.'/',$val['fullpath']) || preg_match('/'.$keyfilter4.'/',$val['fullpath']))
                 {
-                    //print "Categ discarded ".$this->cats[$key]['fullpath']."\n";
-                    //$this->cats[$key]['marked']=1;
                     unset($this->cats[$key]);
                 }
             }
@@ -630,51 +667,38 @@ class Categorie
 	 * 	@param		int		$protection		Deep counter to avoid infinite loop
 	 *	@return		void
 	 */
-	function build_path_from_id_categ($id_categ,$protection=0)
+	function build_path_from_id_categ($id_categ,$protection=1000)
 	{
 		dol_syslog(get_class($this)."::build_path_from_id_categ id_categ=".$id_categ." protection=".$protection, LOG_DEBUG);
 
-		//if (! empty($this->cats[$id_categ]['fullpath']))
-		//{
-		// Already defined
-		//	dol_syslog(get_class($this)."::build_path_from_id_categ fullpath and fulllabel already defined", LOG_WARNING);
-		//	return;
-		//}
+		if (! empty($this->cats[$id_categ]['fullpath']))
+		{
+			// Already defined
+			dol_syslog(get_class($this)."::build_path_from_id_categ fullpath and fulllabel already defined", LOG_WARNING);
+			return;
+		}
+
+		// First build full array $motherof
+		//$this->load_motherof();	// Disabled because already done by caller of build_path_from_id_categ
 
 		// Define fullpath and fulllabel
-		if (! empty($this->cats[$id_categ]['fk_parent']))
+		$this->cats[$id_categ]['fullpath'] = '_'.$id_categ;
+		$this->cats[$id_categ]['fulllabel'] = $this->cats[$id_categ]['label'];
+		$i=0; $cursor_categ=$id_categ;
+		//print 'Work for id_categ='.$id_categ.'<br>'."\n";
+		while ((empty($protection) || $i < $protection) && ! empty($this->motherof[$cursor_categ]))
 		{
-			$this->cats[$id_categ]['fullpath'] = $this->cats[$this->cats[$id_categ]['fk_parent']]['fullpath'];
-			$this->cats[$id_categ]['fullpath'].= '_'.$id_categ;
-			$this->cats[$id_categ]['fulllabel'] = $this->cats[$this->cats[$id_categ]['fk_parent']]['fulllabel'];
-			$this->cats[$id_categ]['fulllabel'].= ' >> '.$this->cats[$id_categ]['label'];
-		}
-		else
-		{
-			$this->cats[$id_categ]['fullpath'] = '_'.$id_categ;
-			$this->cats[$id_categ]['fulllabel'] = $this->cats[$id_categ]['label'];
+			//print '&nbsp; cursor_categ='.$cursor_categ.' i='.$i.' '.$this->motherof[$cursor_categ].'<br>'."\n";
+			$this->cats[$id_categ]['fullpath'] = '_'.$this->motherof[$cursor_categ].$this->cats[$id_categ]['fullpath'];
+			$this->cats[$id_categ]['fulllabel'] = $this->cats[$this->motherof[$cursor_categ]]['label'].' >> '.$this->cats[$id_categ]['fulllabel'];
+			//print '&nbsp; Result for id_categ='.$id_categ.' : '.$this->cats[$id_categ]['fullpath'].' '.$this->cats[$id_categ]['fulllabel'].'<br>'."\n";
+			$i++; $cursor_categ=$this->motherof[$cursor_categ];
 		}
+		//print 'Result for id_categ='.$id_categ.' : '.$this->cats[$id_categ]['fullpath'].'<br>'."\n";
+
 		// We count number of _ to have level
 		$this->cats[$id_categ]['level']=dol_strlen(preg_replace('/[^_]/i','',$this->cats[$id_categ]['fullpath']));
 
-		/*
-		// Process all childs on several levels of this category
-		$protection++;
-		if ($protection > 10) return;	// On ne traite pas plus de 10 niveaux de profondeurs
-		if (empty($this->cats[$id_categ]['id_children'])) return;
-		foreach($this->cats[$id_categ]['id_children'] as $key => $idchild)
-		{
-			// Protection when a category has itself as a child (should not happen)
-			if ($idchild == $id_categ)
-			{
-				dol_syslog(get_class($this)."::build_path_from_id_categ bad couple (".$idchild.",".$id_categ.") in association table: An entry should not have itself has child", LOG_WARNING);
-				continue;
-			}
-
-			$this->build_path_from_id_categ($idchild,$protection);
-		}
-		*/
-
 		return;
 	}
 
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index be5cb6120b5..c9102fdaa17 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -209,12 +209,15 @@ foreach($fulltree as $key => $val)
 	// Define showline
 	$showline=0;
 
+	//var_dump($expandedsectionarray);
+
 	// If directory is son of expanded directory, we show line
 	if (isset($val['fk_parent']) && in_array($val['fk_parent'],$expandedsectionarray)) $showline=4;
 	// If directory is parent of selected directory or is selected directory, we show line
 	elseif (preg_match('/'.$val['fullpath'].'_/i',$fullpathselected.'_')) $showline=2;
 	// If we are level one we show line
 	elseif ($val['level'] < 2) $showline=1;
+	//print 'xxx '.$val['level'].' - '.$fullpathselected.' - '.$val['fullpath'].' - '.$val['fk_parent'].' showline='.$showline.'<br>'."\n";
 
 	if ($showline)
 	{
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 1b5cfde2370..bdb8dd0f366 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -479,13 +479,13 @@ class EcmDirectory // extends CommonObject
 
 		$this->motherof=array();
 
-		// Charge tableau des meres
+		// Load array[child]=parent
 		$sql = "SELECT fk_parent as id_parent, rowid as id_son";
 		$sql.= " FROM ".MAIN_DB_PREFIX."ecm_directories";
 		$sql.= " WHERE fk_parent != 0";
 		$sql.= " AND entity = ".$conf->entity;
 
-		dol_syslog(get_class($this)."::get_full_arbo sql=".$sql);
+		dol_syslog(get_class($this)."::load_motherof sql=".$sql);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{

From fa2e9cbd4f66ac6df6e5a20467851782a589aca0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Jan 2013 10:06:39 +0100
Subject: [PATCH 017/162] Exclude external modules

---
 htdocs/public/demo/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 9109cabc09b..b8a240b44b6 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -78,7 +78,7 @@ $alwayshiddencheckedmodules=array('accounting','barcode','bookmark','clicktodial
                                 'memcached','numberwords','zipautofillfr');
 $alwayshiddenuncheckedmodules=array('boutique','ftp',
                                 // Extended modules
-                                'awstats','bittorrent','cabinetmed','cmcic','concatpdf','dolicloud','filemanager','lightbox','mantis','monitoring','moretemplates','nltechno','numberingpack','openstreetmap',
+                                'awstats','bittorrent','bootstrap','cabinetmed','cmcic','concatpdf','customfield','dolicloud','filemanager','lightbox','mantis','monitoring','moretemplates','multicompany','nltechno','numberingpack','openstreetmap',
                                 'ovh','phenix','phpsysinfo','pibarcode','postnuke','skincoloreditor','submiteverywhere','survey','thomsonphonebook','topten','tvacerfa','voyage','webcalendar','webmail');
 
 // Search modules

From 8682d3c928be430c7feec0537e1a547031d06271 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Jan 2013 12:16:00 +0100
Subject: [PATCH 018/162] Fix: Note not visible

---
 htdocs/compta/deplacement/fiche.php   | 5 +++--
 htdocs/core/tpl/bloc_showhide.tpl.php | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php
index f41cf6932ac..d13880f7559 100644
--- a/htdocs/compta/deplacement/fiche.php
+++ b/htdocs/compta/deplacement/fiche.php
@@ -522,7 +522,7 @@ else if ($id)
             print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
 
             // Other attributes
-            $parameters=array('colspan' => ' colspan="3"');
+            $parameters=array('colspan' => ' colspan="3"', 'showblocbydefault' => 1);
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
             print "</table><br>";
@@ -578,7 +578,8 @@ else if ($id)
     }
 }
 
-$db->close();
 
 llxFooter();
+
+$db->close();
 ?>
diff --git a/htdocs/core/tpl/bloc_showhide.tpl.php b/htdocs/core/tpl/bloc_showhide.tpl.php
index d628a3e4579..2ac7ce4a397 100644
--- a/htdocs/core/tpl/bloc_showhide.tpl.php
+++ b/htdocs/core/tpl/bloc_showhide.tpl.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
+ * 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
@@ -13,11 +14,11 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
  */
 
-// Hide by default
-$hide = (empty($object->extraparams[$blocname]['showhide']) ? true : false);
+$hide = true;	// Hide by default
+if (isset($parameters['showblocbydefault'])) $hide=(empty($parameters['showblocbydefault']) ? true : false);
+if (isset($object->extraparams[$blocname]['showhide'])) $hide = (empty($object->extraparams[$blocname]['showhide']) ? true : false);
 
 ?>
 

From 9f44161e553966a0eeb6d30946dc141ed1ceedce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 24 Jan 2013 12:47:06 +0100
Subject: [PATCH 019/162] New: Can attach file for trip and expenses module

---
 htdocs/compta/deplacement/document.php | 171 +++++++++++++++++++++++++
 htdocs/core/lib/trip.lib.php           |  11 +-
 htdocs/document.php                    |  11 ++
 3 files changed, 190 insertions(+), 3 deletions(-)
 create mode 100644 htdocs/compta/deplacement/document.php

diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
new file mode 100644
index 00000000000..9b07bccd7ae
--- /dev/null
+++ b/htdocs/compta/deplacement/document.php
@@ -0,0 +1,171 @@
+<?php
+/* Copyright (C) 2003-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2010 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2005-2009 Regis Houssin         <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005      Simon TOSSER          <simon@kornog-computing.com>
+ * Copyright (C) 2011-2012 Juanjo Menent         <jmenent@2byte.es>
+ *
+ * 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/compta/deplacement/document.php
+ *       \ingroup    deplacement
+ *       \brief      Page of linked files onto trip and expenses
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/trip.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+
+$langs->load("other");
+$langs->load("trips");
+$langs->load("companies");
+$langs->load("interventions");
+
+$id = GETPOST('id','int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action','alpha');
+$confirm = GETPOST('confirm','alpha');
+
+// Security check
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'deplacement', $id, '');
+
+
+// Get parameters
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
+$page = GETPOST('page','int');
+if ($page == -1) { $page = 0; }
+$offset = $conf->liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) $sortfield="name";
+
+
+$object = new Deplacement($db);
+$object->fetch($id, $ref);
+
+$upload_dir = $conf->deplacement->dir_output.'/'.dol_sanitizeFileName($object->ref);
+$modulepart='trip';
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('sendit','alpha') && ! empty($conf->global->MAIN_UPLOAD_DOC))
+{
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+	dol_add_file_process($upload_dir,0,1,'userfile');
+}
+
+// Delete
+else if ($action == 'confirm_deletefile' && $confirm == 'yes')
+{
+	if ($object->id > 0)
+	{
+		$langs->load("other");
+		$object->fetch_thirdparty();
+
+		$file = $upload_dir . '/' . GETPOST('urlfile');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
+		$ret=dol_delete_file($file,0,0,0,$object);
+		if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
+		else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
+		exit;
+	}
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+llxHeader("","",$langs->trans("TripCard"));
+
+
+if ($object->id)
+{
+	$object->fetch_thirdparty();
+
+	$head=trip_prepare_head($object, $user);
+
+	dol_fiche_head($head, 'documents',  $langs->trans("TripCard"), 0, 'trip');
+
+
+	// Construit liste des fichiers
+	$filearray=dol_dir_list($upload_dir,"files",0,'','\.meta$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+	$totalsize=0;
+	foreach($filearray as $key => $file)
+	{
+		$totalsize+=$file['size'];
+	}
+
+
+    print '<table class="border" width="100%">';
+
+    $linkback = '<a href="'.DOL_URL_ROOT.'/compta/deplacement/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+
+	// Ref
+	print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td>';
+	print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
+	print '</td></tr>';
+
+	// Societe
+	//print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
+
+    print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+    print '</table>';
+
+    print '</div>';
+
+    /*
+     * Confirmation suppression fichier
+     */
+    if ($action == 'delete')
+    {
+    	$ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
+    	if ($ret == 'html') print '<br>';
+    }
+
+    // Affiche formulaire upload
+   	$formfile=new FormFile($db);
+	$formfile->form_attach_new_file(DOL_URL_ROOT.'/compta/deplacement/document.php?id='.$object->id,'',0,0,$user->rights->deplacement->creer,50,$object);
+
+
+	// List of document
+	$param='&id='.$object->id;
+	$formfile->list_of_documents($filearray,$object,'deplacement',$param);
+
+}
+else
+{
+	print $langs->trans("UnkownError");
+}
+
+llxFooter();
+
+$db->close();
+?>
diff --git a/htdocs/core/lib/trip.lib.php b/htdocs/core/lib/trip.lib.php
index 7655e68e6c0..309bcf33224 100644
--- a/htdocs/core/lib/trip.lib.php
+++ b/htdocs/core/lib/trip.lib.php
@@ -45,11 +45,16 @@ function trip_prepare_head($object)
     // $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf,$langs,$object,$head,$h,'trip');
 
-	$head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/info.php?id=' . $object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
+	$head[$h][0] = DOL_URL_ROOT.'/compta/deplacement/document.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Documents");
+	$head[$h][2] = 'documents';
 	$h++;
 
+	$head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/info.php?id=' . $object->id;
+	$head[$h][1] = $langs->trans("Info");
+	$head[$h][2] = 'info';
+	$h++;
+	
 	complete_head_from_modules($conf,$langs,$object,$head,$h,'trip','remove');
 
 	return $head;
diff --git a/htdocs/document.php b/htdocs/document.php
index 537ad4657c6..29d189f9a83 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -137,6 +137,17 @@ if ($modulepart)
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$refname."' AND entity=".$conf->entity;
 	}
 
+	// Wrapping pour les deplacements et notes de frais
+	else if ($modulepart == 'deplacement')
+	{
+		if ($user->rights->deplacement->lire || preg_match('/^specimen/i',$original_file))
+		{
+			$accessallowed=1;
+		}
+		$original_file=$conf->deplacement->dir_output.'/'.$original_file;
+		//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$refname."' AND entity=".$conf->entity;
+	}
+	
 	// Wrapping pour les prelevements
 	else if ($modulepart == 'prelevement')
 	{

From 03d6903248e748881f316a52769aa532cbf8f817 Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Thu, 24 Jan 2013 12:53:42 +0100
Subject: [PATCH 020/162] Fix:  [ bug #698 ] Bad calculation of totals of
 associated documents

---
 htdocs/comm/propal/tpl/linkedobjectblock.tpl.php    | 4 +++-
 htdocs/commande/tpl/linkedobjectblock.tpl.php       | 4 +++-
 htdocs/compta/facture/tpl/linkedobjectblock.tpl.php | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index 4337611066e..e9ad176a86d 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2010-2011  Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Juanjo Menent <jmenent@2byte.es>
  *
  * 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
@@ -37,6 +38,7 @@ print_titre($langs->trans('RelatedCommercialProposals'));
 </tr>
 <?php
 $var=true;
+$total=0;
 foreach($linkedObjectBlock as $object)
 {
 	$var=!$var;
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index f5bf3f8ccce..c7d073501a3 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2010-2011	Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Juanjo Menent <jmenent@2byte.es>
  *
  * 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
@@ -38,6 +39,7 @@ print_titre($langs->trans('RelatedOrders'));
 </tr>
 <?php
 $var=true;
+$total=0;
 foreach($linkedObjectBlock as $object)
 {
 	$var=!$var;
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index b36bffb3c68..f0fca0b90ff 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2010-2011	Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Juanjo Menent <jmenent@2byte.es>
  *
  * 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
@@ -38,6 +39,7 @@ else print_titre($langs->trans("RelatedBill"));
 </tr>
 <?php
 $var=true;
+$total=0;
 foreach($linkedObjectBlock as $object)
 {
 	$var=!$var;

From c7325324839e1796400eb3246873af922d964434 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Thu, 24 Jan 2013 17:29:11 +0100
Subject: [PATCH 021/162] New: add hook getFormMail

---
 htdocs/core/class/html.formmail.class.php | 835 +++++++++++-----------
 1 file changed, 429 insertions(+), 406 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 3d15fdbeeee..c221cc33c07 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -217,422 +217,445 @@ class FormMail
     function get_form($addfileaction='addfile',$removefileaction='removefile')
     {
         global $conf, $langs, $user;
+        global $hookmanager;
 
         $langs->load("other");
         $langs->load("mails");
 
-        $out='';
-
-        // Define list of attached files
-        $listofpaths=array();
-        $listofnames=array();
-        $listofmimes=array();
-        if (! empty($_SESSION["listofpaths"])) $listofpaths=explode(';',$_SESSION["listofpaths"]);
-        if (! empty($_SESSION["listofnames"])) $listofnames=explode(';',$_SESSION["listofnames"]);
-        if (! empty($_SESSION["listofmimes"])) $listofmimes=explode(';',$_SESSION["listofmimes"]);
-
-
-        $form=new Form($this->db);
-
-        $out.= "\n<!-- Debut form mail -->\n";
-        if ($this->withform)
+        if (! is_object($hookmanager))
         {
-            $out.= '<form method="POST" name="mailform" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">'."\n";
-            $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
+        	if (! class_exists('HookManager')) {
+        		// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+        		require DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+        		$hookmanager=new HookManager($this->db);
+        	}
         }
-        foreach ($this->param as $key=>$value)
+        $hookmanager->initHooks(array('formmail'));
+
+        $parameters=array(
+        		'addfileaction' => $addfileaction,
+        		'removefileaction'=> $removefileaction
+        );
+        $reshook=$hookmanager->executeHooks('getFormMail', $parameters, $this);
+
+        if (!empty($reshook))
         {
-            $out.= '<input type="hidden" id="'.$key.'" name="'.$key.'" value="'.$value.'" />'."\n";
+        	return $hookmanager->resPrint;
         }
-        $out.= '<table class="border" width="100%">'."\n";
-
-        // Substitution array
-        if (! empty($this->withsubstit))
+        else
         {
-            $out.= '<tr><td colspan="2">';
-            $help="";
-            foreach($this->substit as $key => $val)
-            {
-                $help.=$key.' -> '.$langs->trans($val).'<br>';
-            }
-            $out.= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"),$help);
-            $out.= "</td></tr>\n";
+        	$out='';
+
+        	// Define list of attached files
+        	$listofpaths=array();
+        	$listofnames=array();
+        	$listofmimes=array();
+        	if (! empty($_SESSION["listofpaths"])) $listofpaths=explode(';',$_SESSION["listofpaths"]);
+        	if (! empty($_SESSION["listofnames"])) $listofnames=explode(';',$_SESSION["listofnames"]);
+        	if (! empty($_SESSION["listofmimes"])) $listofmimes=explode(';',$_SESSION["listofmimes"]);
+
+        	$form=new Form($this->db);
+
+        	$out.= "\n<!-- Debut form mail -->\n";
+        	if ($this->withform)
+        	{
+        		$out.= '<form method="POST" name="mailform" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">'."\n";
+        		$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
+        	}
+        	foreach ($this->param as $key=>$value)
+        	{
+        		$out.= '<input type="hidden" id="'.$key.'" name="'.$key.'" value="'.$value.'" />'."\n";
+        	}
+        	$out.= '<table class="border" width="100%">'."\n";
+
+        	// Substitution array
+        	if (! empty($this->withsubstit))
+        	{
+        		$out.= '<tr><td colspan="2">';
+        		$help="";
+        		foreach($this->substit as $key => $val)
+        		{
+        			$help.=$key.' -> '.$langs->trans($val).'<br>';
+        		}
+        		$out.= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"),$help);
+        		$out.= "</td></tr>\n";
+        	}
+
+        	// From
+        	if (! empty($this->withfrom))
+        	{
+        		if (! empty($this->withfromreadonly))
+        		{
+        			$out.= '<input type="hidden" id="fromname" name="fromname" value="'.$this->fromname.'" />';
+        			$out.= '<input type="hidden" id="frommail" name="frommail" value="'.$this->frommail.'" />';
+        			$out.= '<tr><td width="180">'.$langs->trans("MailFrom").'</td><td>';
+        			if ($this->fromtype == 'user' && $this->fromid > 0)
+        			{
+        				$langs->load("users");
+        				$fuser=new User($this->db);
+        				$fuser->fetch($this->fromid);
+        				$out.= $fuser->getNomUrl(1);
+        			}
+        			else
+        			{
+        				$out.= $this->fromname;
+        			}
+        			if ($this->frommail)
+        			{
+        				$out.= " &lt;".$this->frommail."&gt;";
+        			}
+        			else
+        			{
+        				if ($this->fromtype)
+        				{
+        					$langs->load("errors");
+        					$out.= '<font class="warning"> &lt;'.$langs->trans("ErrorNoMailDefinedForThisUser").'&gt; </font>';
+        				}
+        			}
+        			$out.= "</td></tr>\n";
+        			$out.= "</td></tr>\n";
+        		}
+        		else
+        		{
+        			$out.= "<tr><td>".$langs->trans("MailFrom")."</td><td>";
+        			$out.= $langs->trans("Name").':<input type="text" id="fromname" name="fromname" size="32" value="'.$this->fromname.'" />';
+        			$out.= '&nbsp; &nbsp; ';
+        			$out.= $langs->trans("EMail").':&lt;<input type="text" id="frommail" name="frommail" size="32" value="'.$this->frommail.'" />&gt;';
+        			$out.= "</td></tr>\n";
+        		}
+        	}
+
+        	// Replyto
+        	if (! empty($this->withreplyto))
+        	{
+        		if ($this->withreplytoreadonly)
+        		{
+        			$out.= '<input type="hidden" id="replyname" name="replyname" value="'.$this->replytoname.'" />';
+        			$out.= '<input type="hidden" id="replymail" name="replymail" value="'.$this->replytomail.'" />';
+        			$out.= "<tr><td>".$langs->trans("MailReply")."</td><td>".$this->replytoname.($this->replytomail?(" &lt;".$this->replytomail."&gt;"):"");
+        			$out.= "</td></tr>\n";
+        		}
+        	}
+
+        	// Errorsto
+        	if (! empty($this->witherrorsto))
+        	{
+        		//if (! $this->errorstomail) $this->errorstomail=$this->frommail;
+        		$errorstomail = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? $conf->global->MAIN_MAIL_ERRORS_TO : $this->errorstomail);
+        		if ($this->witherrorstoreadonly)
+        		{
+        			$out.= '<input type="hidden" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
+        			$out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
+        			$out.= $errorstomail;
+        			$out.= "</td></tr>\n";
+        		}
+        		else
+        		{
+        			$out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
+        			$out.= '<input size="30" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
+        			$out.= "</td></tr>\n";
+        		}
+        	}
+
+        	// To
+        	if (! empty($this->withto) || is_array($this->withto))
+        	{
+        		$out.= '<tr><td width="180">';
+        		if ($this->withtofree) $out.= $form->textwithpicto($langs->trans("MailTo"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+        		else $out.= $langs->trans("MailTo");
+        		$out.= '</td><td>';
+        		if ($this->withtoreadonly)
+        		{
+        			if (! empty($this->toname) && ! empty($this->tomail))
+        			{
+        				$out.= '<input type="hidden" id="toname" name="toname" value="'.$this->toname.'" />';
+        				$out.= '<input type="hidden" id="tomail" name="tomail" value="'.$this->tomail.'" />';
+        				if ($this->totype == 'thirdparty')
+        				{
+        					$soc=new Societe($this->db);
+        					$soc->fetch($this->toid);
+        					$out.= $soc->getNomUrl(1);
+        				}
+        				else if ($this->totype == 'contact')
+        				{
+        					$contact=new Contact($this->db);
+        					$contact->fetch($this->toid);
+        					$out.= $contact->getNomUrl(1);
+        				}
+        				else
+        				{
+        					$out.= $this->toname;
+        				}
+        				$out.= ' &lt;'.$this->tomail.'&gt;';
+        				if ($this->withtofree)
+        				{
+        					$out.= '<br>'.$langs->trans("or").' <input size="'.(is_array($this->withto)?"30":"60").'" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
+        				}
+        			}
+        			else
+        			{
+        				$out.= (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
+        			}
+        		}
+        		else
+        		{
+        			if (! empty($this->withtofree))
+        			{
+        				$out.= '<input size="'.(is_array($this->withto)?"30":"60").'" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
+        			}
+        			if (! empty($this->withto) && is_array($this->withto))
+        			{
+        				if (! empty($this->withtofree)) $out.= " ".$langs->trans("or")." ";
+        				$out.= $form->selectarray("receiver", $this->withto, GETPOST("receiver"), 1);
+        			}
+        			if (isset($this->withtosocid) && $this->withtosocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
+        			{
+        				$liste=array();
+        				$soc=new Societe($this->db);
+        				$soc->fetch($this->withtosocid);
+        				foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
+        				{
+        					$liste[$key]=$value;
+        				}
+        				if ($this->withtofree) $out.= " ".$langs->trans("or")." ";
+        				$out.= $form->selectarray("receiver", $liste, GETPOST("receiver"), 1);
+        			}
+        		}
+        		$out.= "</td></tr>\n";
+        	}
+
+        	// CC
+        	if (! empty($this->withtocc) || is_array($this->withtocc))
+        	{
+        		$out.= '<tr><td width="180">';
+        		$out.= $form->textwithpicto($langs->trans("MailCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+        		$out.= '</td><td>';
+        		if ($this->withtoccreadonly)
+        		{
+        			$out.= (! is_array($this->withtocc) && ! is_numeric($this->withtocc))?$this->withtocc:"";
+        		}
+        		else
+        		{
+        			$out.= '<input size="'.(is_array($this->withtocc)?"30":"60").'" id="sendtocc" name="sendtocc" value="'.((! is_array($this->withtocc) && ! is_numeric($this->withtocc))? (isset($_POST["sendtocc"])?$_POST["sendtocc"]:$this->withtocc) : (isset($_POST["sendtocc"])?$_POST["sendtocc"]:"") ).'" />';
+        			if (! empty($this->withto) && is_array($this->withto))
+        			{
+        				$out.= " ".$langs->trans("or")." ";
+        				$out.= $form->selectarray("receivercc", $this->withto, GETPOST("receivercc"), 1);
+        			}
+        			if (! empty($this->withtoccsocid) && $this->withtoccsocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
+        			{
+        				$liste=array();
+        				$soc=new Societe($this->db);
+        				$soc->fetch($this->withtoccsocid);
+        				foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
+        				{
+        					$liste[$key]=$value;
+        				}
+        				$out.= " ".$langs->trans("or")." ";
+        				$out.= $form->selectarray("receivercc", $liste, GETPOST("receivercc"), 1);
+        			}
+        		}
+        		$out.= "</td></tr>\n";
+        	}
+
+        	// CCC
+        	if (! empty($this->withtoccc) || is_array($this->withtoccc))
+        	{
+        		$out.= '<tr><td width="180">';
+        		$out.= $form->textwithpicto($langs->trans("MailCCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+        		$out.= '</td><td>';
+        		if (! empty($this->withtocccreadonly))
+        		{
+        			$out.= (! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))?$this->withtoccc:"";
+        		}
+        		else
+        		{
+        			$out.= '<input size="'.(is_array($this->withtoccc)?"30":"60").'" id="sendtoccc" name="sendtoccc" value="'.((! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))? (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:$this->withtoccc) : (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:"") ).'" />';
+        			if (! empty($this->withto) && is_array($this->withto))
+        			{
+        				$out.= " ".$langs->trans("or")." ";
+        				$out.= $form->selectarray("receiverccc", $this->withto, GETPOST("receiverccc"), 1);
+        			}
+        			if (! empty($this->withtocccsocid) && $this->withtocccsocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
+        			{
+        				$liste=array();
+        				$soc=new Societe($this->db);
+        				$soc->fetch($this->withtosocid);
+        				foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
+        				{
+        					$liste[$key]=$value;
+        				}
+        				$out.= " ".$langs->trans("or")." ";
+        				$out.= $form->selectarray("receiverccc", $liste, GETPOST("receiverccc"), 1);
+        			}
+        		}
+        		//if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print ' '.info_admin("+ ".$conf->global->MAIN_MAIL_AUTOCOPY_TO,1);
+        		$out.= "</td></tr>\n";
+        	}
+
+        	// Ask delivery receipt
+        	if (! empty($this->withdeliveryreceipt))
+        	{
+        		$out.= '<tr><td width="180">'.$langs->trans("DeliveryReceipt").'</td><td>';
+
+        		if (! empty($this->withdeliveryreceiptreadonly))
+        		{
+        			$out.= yn($this->withdeliveryreceipt);
+        		}
+        		else
+        		{
+        			$out.= $form->selectyesno('deliveryreceipt', (isset($_POST["deliveryreceipt"])?$_POST["deliveryreceipt"]:0), 1);
+        		}
+
+        		$out.= "</td></tr>\n";
+        	}
+
+        	// Topic
+        	if (! empty($this->withtopic))
+        	{
+        		$this->withtopic=make_substitutions($this->withtopic,$this->substit);
+
+        		$out.= '<tr>';
+        		$out.= '<td width="180">'.$langs->trans("MailTopic").'</td>';
+        		$out.= '<td>';
+        		if ($this->withtopicreadonly)
+        		{
+        			$out.= $this->withtopic;
+        			$out.= '<input type="hidden" size="60" id="subject" name="subject" value="'.$this->withtopic.'" />';
+        		}
+        		else
+        		{
+        			$out.= '<input type="text" size="60" id="subject" name="subject" value="'. (isset($_POST["subject"])?$_POST["subject"]:$this->withtopic) .'" />';
+        		}
+        		$out.= "</td></tr>\n";
+        	}
+
+        	// Attached files
+        	if (! empty($this->withfile))
+        	{
+        		$out.= '<tr>';
+        		$out.= '<td width="180">'.$langs->trans("MailFile").'</td>';
+        		$out.= '<td>';
+        		// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
+        		$out.= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
+        		$out.= '<script type="text/javascript" language="javascript">';
+        		$out.= 'jQuery(document).ready(function () {';
+        		$out.= '    jQuery(".removedfile").click(function() {';
+        		$out.= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
+        		$out.= '    });';
+        		$out.= '})';
+        		$out.= '</script>'."\n";
+        		if (count($listofpaths))
+        		{
+        			foreach($listofpaths as $key => $val)
+        			{
+        				$out.= '<div id="attachfile_'.$key.'">';
+        				$out.= img_mime($listofnames[$key]).' '.$listofnames[$key];
+        				if (! $this->withfilereadonly)
+        				{
+        					$out.= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
+        					//$out.= ' <a href="'.$_SERVER["PHP_SELF"].'?removedfile='.($key+1).' id="removedfile_'.$key.'">'.img_delete($langs->trans("Delete").'</a>';
+        				}
+        				$out.= '<br></div>';
+        			}
+        		}
+        		else
+        		{
+        			$out.= $langs->trans("NoAttachedFiles").'<br>';
+        		}
+        		if ($this->withfile == 2)	// Can add other files
+        		{
+        			$out.= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
+        			$out.= ' ';
+        			$out.= '<input type="submit" class="button" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
+        		}
+        		$out.= "</td></tr>\n";
+        	}
+
+        	// Message
+        	if (! empty($this->withbody))
+        	{
+        		$defaultmessage="";
+
+        		// TODO    A partir du type, proposer liste de messages dans table llx_models
+        		if     ($this->param["models"]=='facture_send')	            { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoice"); }
+        		elseif ($this->param["models"]=='facture_relance')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
+        		elseif ($this->param["models"]=='propal_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); }
+        		elseif ($this->param["models"]=='order_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
+        		elseif ($this->param["models"]=='order_supplier_send')		{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
+        		elseif ($this->param["models"]=='invoice_supplier_send')	{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
+        		elseif ($this->param["models"]=='shipping_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendShipping"); }
+        		elseif ($this->param["models"]=='fichinter_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendFichInter"); }
+        		elseif (! is_numeric($this->withbody))                      { $defaultmessage=$this->withbody; }
+
+        		// Complete substitution array
+        		if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_ADD_PAYMENT_URL))
+        		{
+        			require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
+
+        			$langs->load('paypal');
+
+        			if ($this->param["models"]=='order_send')
+        			{
+        				$url=getPaypalPaymentUrl(0,'order',$this->substit['__ORDERREF__']);
+        				$this->substit['__PERSONALIZED__']=$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url);
+        			}
+        			if ($this->param["models"]=='facture_send')
+        			{
+        				$url=getPaypalPaymentUrl(0,'invoice',$this->substit['__FACREF__']);
+        				$this->substit['__PERSONALIZED__']=$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url);
+        			}
+        		}
+
+        		$defaultmessage=make_substitutions($defaultmessage,$this->substit);
+        		if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
+        		$defaultmessage=str_replace('\n',"\n",$defaultmessage);
+
+        		$out.= '<tr>';
+        		$out.= '<td width="180" valign="top">'.$langs->trans("MailText").'</td>';
+        		$out.= '<td>';
+        		if ($this->withbodyreadonly)
+        		{
+        			$out.= nl2br($defaultmessage);
+        			$out.= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />';
+        		}
+        		else
+        		{
+        			if (! isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes';
+
+        			// Editor wysiwyg
+        			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+        			$doleditor=new DolEditor('message',$defaultmessage,'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,72);
+        			$out.= $doleditor->Create(1);
+        		}
+        		$out.= "</td></tr>\n";
+        	}
+
+        	if (! empty($this->withform))
+        	{
+        		$out.= '<tr><td align="center" colspan="2"><center>';
+        		$out.= '<input class="button" type="submit" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"';
+        		// Add a javascript test to avoid to forget to submit file before sending email
+        		if ($this->withfile == 2 && $conf->use_javascript_ajax)
+        		{
+        			$out.= ' onClick="if (document.mailform.addedfile.value != \'\') { alert(\''.dol_escape_js($langs->trans("FileWasNotUploaded")).'\'); return false; } else { return true; }"';
+        		}
+        		$out.= ' />';
+        		if ($this->withcancel)
+        		{
+        			$out.= ' &nbsp; &nbsp; ';
+        			$out.= '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'" />';
+        		}
+        		$out.= '</center></td></tr>'."\n";
+        	}
+
+        	$out.= '</table>'."\n";
+
+        	if (! empty($this->withform)) $out.= '</form>'."\n";
+        	$out.= "<!-- Fin form mail -->\n";
+
+        	return $out;
         }
-
-        // From
-        if (! empty($this->withfrom))
-        {
-            if (! empty($this->withfromreadonly))
-            {
-                $out.= '<input type="hidden" id="fromname" name="fromname" value="'.$this->fromname.'" />';
-                $out.= '<input type="hidden" id="frommail" name="frommail" value="'.$this->frommail.'" />';
-                $out.= '<tr><td width="180">'.$langs->trans("MailFrom").'</td><td>';
-                if ($this->fromtype == 'user' && $this->fromid > 0)
-                {
-                    $langs->load("users");
-                    $fuser=new User($this->db);
-                    $fuser->fetch($this->fromid);
-                    $out.= $fuser->getNomUrl(1);
-                }
-                else
-                {
-                    $out.= $this->fromname;
-                }
-                if ($this->frommail)
-                {
-                    $out.= " &lt;".$this->frommail."&gt;";
-                }
-                else
-                {
-                    if ($this->fromtype)
-                    {
-                        $langs->load("errors");
-                        $out.= '<font class="warning"> &lt;'.$langs->trans("ErrorNoMailDefinedForThisUser").'&gt; </font>';
-                    }
-                }
-                $out.= "</td></tr>\n";
-                $out.= "</td></tr>\n";
-            }
-            else
-            {
-                $out.= "<tr><td>".$langs->trans("MailFrom")."</td><td>";
-                $out.= $langs->trans("Name").':<input type="text" id="fromname" name="fromname" size="32" value="'.$this->fromname.'" />';
-                $out.= '&nbsp; &nbsp; ';
-                $out.= $langs->trans("EMail").':&lt;<input type="text" id="frommail" name="frommail" size="32" value="'.$this->frommail.'" />&gt;';
-                $out.= "</td></tr>\n";
-            }
-        }
-
-        // Replyto
-        if (! empty($this->withreplyto))
-        {
-            if ($this->withreplytoreadonly)
-            {
-                $out.= '<input type="hidden" id="replyname" name="replyname" value="'.$this->replytoname.'" />';
-                $out.= '<input type="hidden" id="replymail" name="replymail" value="'.$this->replytomail.'" />';
-                $out.= "<tr><td>".$langs->trans("MailReply")."</td><td>".$this->replytoname.($this->replytomail?(" &lt;".$this->replytomail."&gt;"):"");
-                $out.= "</td></tr>\n";
-            }
-        }
-
-        // Errorsto
-        if (! empty($this->witherrorsto))
-        {
-            //if (! $this->errorstomail) $this->errorstomail=$this->frommail;
-            $errorstomail = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? $conf->global->MAIN_MAIL_ERRORS_TO : $this->errorstomail);
-            if ($this->witherrorstoreadonly)
-            {
-                $out.= '<input type="hidden" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
-                $out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
-                $out.= $errorstomail;
-                $out.= "</td></tr>\n";
-            }
-            else
-            {
-                $out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
-                $out.= '<input size="30" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
-                $out.= "</td></tr>\n";
-            }
-        }
-
-        // To
-        if (! empty($this->withto) || is_array($this->withto))
-        {
-            $out.= '<tr><td width="180">';
-            if ($this->withtofree) $out.= $form->textwithpicto($langs->trans("MailTo"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
-            else $out.= $langs->trans("MailTo");
-            $out.= '</td><td>';
-            if ($this->withtoreadonly)
-            {
-                if (! empty($this->toname) && ! empty($this->tomail))
-                {
-                    $out.= '<input type="hidden" id="toname" name="toname" value="'.$this->toname.'" />';
-                    $out.= '<input type="hidden" id="tomail" name="tomail" value="'.$this->tomail.'" />';
-                    if ($this->totype == 'thirdparty')
-                    {
-                        $soc=new Societe($this->db);
-                        $soc->fetch($this->toid);
-                        $out.= $soc->getNomUrl(1);
-                    }
-                    else if ($this->totype == 'contact')
-                    {
-                        $contact=new Contact($this->db);
-                        $contact->fetch($this->toid);
-                        $out.= $contact->getNomUrl(1);
-                    }
-                    else
-                    {
-                        $out.= $this->toname;
-                    }
-                    $out.= ' &lt;'.$this->tomail.'&gt;';
-                    if ($this->withtofree)
-                    {
-                        $out.= '<br>'.$langs->trans("or").' <input size="'.(is_array($this->withto)?"30":"60").'" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
-                    }
-                }
-                else
-                {
-                    $out.= (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
-                }
-            }
-            else
-            {
-                if (! empty($this->withtofree))
-                {
-                    $out.= '<input size="'.(is_array($this->withto)?"30":"60").'" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
-                }
-                if (! empty($this->withto) && is_array($this->withto))
-                {
-                    if (! empty($this->withtofree)) $out.= " ".$langs->trans("or")." ";
-                    $out.= $form->selectarray("receiver", $this->withto, GETPOST("receiver"), 1);
-                }
-                if (isset($this->withtosocid) && $this->withtosocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
-                {
-                    $liste=array();
-                    $soc=new Societe($this->db);
-                    $soc->fetch($this->withtosocid);
-                    foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
-                    {
-                        $liste[$key]=$value;
-                    }
-                    if ($this->withtofree) $out.= " ".$langs->trans("or")." ";
-                    $out.= $form->selectarray("receiver", $liste, GETPOST("receiver"), 1);
-                }
-            }
-            $out.= "</td></tr>\n";
-        }
-
-        // CC
-        if (! empty($this->withtocc) || is_array($this->withtocc))
-        {
-            $out.= '<tr><td width="180">';
-            $out.= $form->textwithpicto($langs->trans("MailCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
-            $out.= '</td><td>';
-            if ($this->withtoccreadonly)
-            {
-                $out.= (! is_array($this->withtocc) && ! is_numeric($this->withtocc))?$this->withtocc:"";
-            }
-            else
-            {
-                $out.= '<input size="'.(is_array($this->withtocc)?"30":"60").'" id="sendtocc" name="sendtocc" value="'.((! is_array($this->withtocc) && ! is_numeric($this->withtocc))? (isset($_POST["sendtocc"])?$_POST["sendtocc"]:$this->withtocc) : (isset($_POST["sendtocc"])?$_POST["sendtocc"]:"") ).'" />';
-                if (! empty($this->withto) && is_array($this->withto))
-                {
-                    $out.= " ".$langs->trans("or")." ";
-                    $out.= $form->selectarray("receivercc", $this->withto, GETPOST("receivercc"), 1);
-                }
-                if (! empty($this->withtoccsocid) && $this->withtoccsocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
-                {
-                    $liste=array();
-                    $soc=new Societe($this->db);
-                    $soc->fetch($this->withtoccsocid);
-                    foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
-                    {
-                        $liste[$key]=$value;
-                    }
-                    $out.= " ".$langs->trans("or")." ";
-                    $out.= $form->selectarray("receivercc", $liste, GETPOST("receivercc"), 1);
-                }
-            }
-            $out.= "</td></tr>\n";
-        }
-
-        // CCC
-        if (! empty($this->withtoccc) || is_array($this->withtoccc))
-        {
-            $out.= '<tr><td width="180">';
-            $out.= $form->textwithpicto($langs->trans("MailCCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
-            $out.= '</td><td>';
-            if (! empty($this->withtocccreadonly))
-            {
-                $out.= (! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))?$this->withtoccc:"";
-            }
-            else
-            {
-                $out.= '<input size="'.(is_array($this->withtoccc)?"30":"60").'" id="sendtoccc" name="sendtoccc" value="'.((! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))? (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:$this->withtoccc) : (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:"") ).'" />';
-                if (! empty($this->withto) && is_array($this->withto))
-                {
-                    $out.= " ".$langs->trans("or")." ";
-                    $out.= $form->selectarray("receiverccc", $this->withto, GETPOST("receiverccc"), 1);
-                }
-                if (! empty($this->withtocccsocid) && $this->withtocccsocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
-                {
-                    $liste=array();
-                    $soc=new Societe($this->db);
-                    $soc->fetch($this->withtosocid);
-                    foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
-                    {
-                        $liste[$key]=$value;
-                    }
-                    $out.= " ".$langs->trans("or")." ";
-                    $out.= $form->selectarray("receiverccc", $liste, GETPOST("receiverccc"), 1);
-                }
-            }
-            //if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print ' '.info_admin("+ ".$conf->global->MAIN_MAIL_AUTOCOPY_TO,1);
-            $out.= "</td></tr>\n";
-        }
-
-        // Ask delivery receipt
-        if (! empty($this->withdeliveryreceipt))
-        {
-            $out.= '<tr><td width="180">'.$langs->trans("DeliveryReceipt").'</td><td>';
-
-            if (! empty($this->withdeliveryreceiptreadonly))
-            {
-                $out.= yn($this->withdeliveryreceipt);
-            }
-            else
-            {
-                $out.= $form->selectyesno('deliveryreceipt', (isset($_POST["deliveryreceipt"])?$_POST["deliveryreceipt"]:0), 1);
-            }
-
-            $out.= "</td></tr>\n";
-        }
-
-        // Topic
-        if (! empty($this->withtopic))
-        {
-            $this->withtopic=make_substitutions($this->withtopic,$this->substit);
-
-            $out.= '<tr>';
-            $out.= '<td width="180">'.$langs->trans("MailTopic").'</td>';
-            $out.= '<td>';
-            if ($this->withtopicreadonly)
-            {
-                $out.= $this->withtopic;
-                $out.= '<input type="hidden" size="60" id="subject" name="subject" value="'.$this->withtopic.'" />';
-            }
-            else
-            {
-                $out.= '<input type="text" size="60" id="subject" name="subject" value="'. (isset($_POST["subject"])?$_POST["subject"]:$this->withtopic) .'" />';
-            }
-            $out.= "</td></tr>\n";
-        }
-
-        // Attached files
-        if (! empty($this->withfile))
-        {
-            $out.= '<tr>';
-            $out.= '<td width="180">'.$langs->trans("MailFile").'</td>';
-            $out.= '<td>';
-            // TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
-            $out.= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
-            $out.= '<script type="text/javascript" language="javascript">';
-            $out.= 'jQuery(document).ready(function () {';
-            $out.= '    jQuery(".removedfile").click(function() {';
-            $out.= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
-            $out.= '    });';
-            $out.= '})';
-            $out.= '</script>'."\n";
-            if (count($listofpaths))
-            {
-                foreach($listofpaths as $key => $val)
-                {
-                    $out.= '<div id="attachfile_'.$key.'">';
-                    $out.= img_mime($listofnames[$key]).' '.$listofnames[$key];
-                    if (! $this->withfilereadonly)
-                    {
-                        $out.= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
-                        //$out.= ' <a href="'.$_SERVER["PHP_SELF"].'?removedfile='.($key+1).' id="removedfile_'.$key.'">'.img_delete($langs->trans("Delete").'</a>';
-                    }
-                    $out.= '<br></div>';
-                }
-            }
-            else
-            {
-                $out.= $langs->trans("NoAttachedFiles").'<br>';
-            }
-            if ($this->withfile == 2)	// Can add other files
-            {
-                $out.= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
-                $out.= ' ';
-                $out.= '<input type="submit" class="button" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
-            }
-            $out.= "</td></tr>\n";
-        }
-
-        // Message
-        if (! empty($this->withbody))
-        {
-            $defaultmessage="";
-
-            // TODO    A partir du type, proposer liste de messages dans table llx_models
-            if     ($this->param["models"]=='facture_send')	            { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoice"); }
-            elseif ($this->param["models"]=='facture_relance')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
-            elseif ($this->param["models"]=='propal_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); }
-            elseif ($this->param["models"]=='order_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
-            elseif ($this->param["models"]=='order_supplier_send')		{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
-            elseif ($this->param["models"]=='invoice_supplier_send')	{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
-            elseif ($this->param["models"]=='shipping_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendShipping"); }
-            elseif ($this->param["models"]=='fichinter_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendFichInter"); }
-            elseif (! is_numeric($this->withbody))                      { $defaultmessage=$this->withbody; }
-
-            // Complete substitution array
-            if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_ADD_PAYMENT_URL))
-            {
-                require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
-
-                $langs->load('paypal');
-
-                if ($this->param["models"]=='order_send')
-                {
-                    $url=getPaypalPaymentUrl(0,'order',$this->substit['__ORDERREF__']);
-                    $this->substit['__PERSONALIZED__']=$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url);
-                }
-                if ($this->param["models"]=='facture_send')
-                {
-                    $url=getPaypalPaymentUrl(0,'invoice',$this->substit['__FACREF__']);
-                    $this->substit['__PERSONALIZED__']=$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url);
-                }
-            }
-
-            $defaultmessage=make_substitutions($defaultmessage,$this->substit);
-            if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
-            $defaultmessage=str_replace('\n',"\n",$defaultmessage);
-
-            $out.= '<tr>';
-            $out.= '<td width="180" valign="top">'.$langs->trans("MailText").'</td>';
-            $out.= '<td>';
-            if ($this->withbodyreadonly)
-            {
-                $out.= nl2br($defaultmessage);
-                $out.= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />';
-            }
-            else
-            {
-            	if (! isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes';
-
-                // Editor wysiwyg
-                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-                $doleditor=new DolEditor('message',$defaultmessage,'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,72);
-                $out.= $doleditor->Create(1);
-            }
-            $out.= "</td></tr>\n";
-        }
-
-        if (! empty($this->withform))
-        {
-            $out.= '<tr><td align="center" colspan="2"><center>';
-            $out.= '<input class="button" type="submit" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"';
-            // Add a javascript test to avoid to forget to submit file before sending email
-            if ($this->withfile == 2 && $conf->use_javascript_ajax)
-            {
-                $out.= ' onClick="if (document.mailform.addedfile.value != \'\') { alert(\''.dol_escape_js($langs->trans("FileWasNotUploaded")).'\'); return false; } else { return true; }"';
-            }
-            $out.= ' />';
-            if ($this->withcancel)
-            {
-                $out.= ' &nbsp; &nbsp; ';
-                $out.= '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'" />';
-            }
-            $out.= '</center></td></tr>'."\n";
-        }
-
-        $out.= '</table>'."\n";
-
-        if (! empty($this->withform)) $out.= '</form>'."\n";
-        $out.= "<!-- Fin form mail -->\n";
-
-        return $out;
     }
 }
 

From c688e2afab1196928363d12acefd8f4dbddaa458 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Thu, 24 Jan 2013 17:29:11 +0100
Subject: [PATCH 022/162] New: add hook getFormMail

---
 htdocs/core/class/html.formmail.class.php | 835 +++++++++++-----------
 1 file changed, 429 insertions(+), 406 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 3d15fdbeeee..c221cc33c07 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -217,422 +217,445 @@ class FormMail
     function get_form($addfileaction='addfile',$removefileaction='removefile')
     {
         global $conf, $langs, $user;
+        global $hookmanager;
 
         $langs->load("other");
         $langs->load("mails");
 
-        $out='';
-
-        // Define list of attached files
-        $listofpaths=array();
-        $listofnames=array();
-        $listofmimes=array();
-        if (! empty($_SESSION["listofpaths"])) $listofpaths=explode(';',$_SESSION["listofpaths"]);
-        if (! empty($_SESSION["listofnames"])) $listofnames=explode(';',$_SESSION["listofnames"]);
-        if (! empty($_SESSION["listofmimes"])) $listofmimes=explode(';',$_SESSION["listofmimes"]);
-
-
-        $form=new Form($this->db);
-
-        $out.= "\n<!-- Debut form mail -->\n";
-        if ($this->withform)
+        if (! is_object($hookmanager))
         {
-            $out.= '<form method="POST" name="mailform" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">'."\n";
-            $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
+        	if (! class_exists('HookManager')) {
+        		// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+        		require DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+        		$hookmanager=new HookManager($this->db);
+        	}
         }
-        foreach ($this->param as $key=>$value)
+        $hookmanager->initHooks(array('formmail'));
+
+        $parameters=array(
+        		'addfileaction' => $addfileaction,
+        		'removefileaction'=> $removefileaction
+        );
+        $reshook=$hookmanager->executeHooks('getFormMail', $parameters, $this);
+
+        if (!empty($reshook))
         {
-            $out.= '<input type="hidden" id="'.$key.'" name="'.$key.'" value="'.$value.'" />'."\n";
+        	return $hookmanager->resPrint;
         }
-        $out.= '<table class="border" width="100%">'."\n";
-
-        // Substitution array
-        if (! empty($this->withsubstit))
+        else
         {
-            $out.= '<tr><td colspan="2">';
-            $help="";
-            foreach($this->substit as $key => $val)
-            {
-                $help.=$key.' -> '.$langs->trans($val).'<br>';
-            }
-            $out.= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"),$help);
-            $out.= "</td></tr>\n";
+        	$out='';
+
+        	// Define list of attached files
+        	$listofpaths=array();
+        	$listofnames=array();
+        	$listofmimes=array();
+        	if (! empty($_SESSION["listofpaths"])) $listofpaths=explode(';',$_SESSION["listofpaths"]);
+        	if (! empty($_SESSION["listofnames"])) $listofnames=explode(';',$_SESSION["listofnames"]);
+        	if (! empty($_SESSION["listofmimes"])) $listofmimes=explode(';',$_SESSION["listofmimes"]);
+
+        	$form=new Form($this->db);
+
+        	$out.= "\n<!-- Debut form mail -->\n";
+        	if ($this->withform)
+        	{
+        		$out.= '<form method="POST" name="mailform" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">'."\n";
+        		$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
+        	}
+        	foreach ($this->param as $key=>$value)
+        	{
+        		$out.= '<input type="hidden" id="'.$key.'" name="'.$key.'" value="'.$value.'" />'."\n";
+        	}
+        	$out.= '<table class="border" width="100%">'."\n";
+
+        	// Substitution array
+        	if (! empty($this->withsubstit))
+        	{
+        		$out.= '<tr><td colspan="2">';
+        		$help="";
+        		foreach($this->substit as $key => $val)
+        		{
+        			$help.=$key.' -> '.$langs->trans($val).'<br>';
+        		}
+        		$out.= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"),$help);
+        		$out.= "</td></tr>\n";
+        	}
+
+        	// From
+        	if (! empty($this->withfrom))
+        	{
+        		if (! empty($this->withfromreadonly))
+        		{
+        			$out.= '<input type="hidden" id="fromname" name="fromname" value="'.$this->fromname.'" />';
+        			$out.= '<input type="hidden" id="frommail" name="frommail" value="'.$this->frommail.'" />';
+        			$out.= '<tr><td width="180">'.$langs->trans("MailFrom").'</td><td>';
+        			if ($this->fromtype == 'user' && $this->fromid > 0)
+        			{
+        				$langs->load("users");
+        				$fuser=new User($this->db);
+        				$fuser->fetch($this->fromid);
+        				$out.= $fuser->getNomUrl(1);
+        			}
+        			else
+        			{
+        				$out.= $this->fromname;
+        			}
+        			if ($this->frommail)
+        			{
+        				$out.= " &lt;".$this->frommail."&gt;";
+        			}
+        			else
+        			{
+        				if ($this->fromtype)
+        				{
+        					$langs->load("errors");
+        					$out.= '<font class="warning"> &lt;'.$langs->trans("ErrorNoMailDefinedForThisUser").'&gt; </font>';
+        				}
+        			}
+        			$out.= "</td></tr>\n";
+        			$out.= "</td></tr>\n";
+        		}
+        		else
+        		{
+        			$out.= "<tr><td>".$langs->trans("MailFrom")."</td><td>";
+        			$out.= $langs->trans("Name").':<input type="text" id="fromname" name="fromname" size="32" value="'.$this->fromname.'" />';
+        			$out.= '&nbsp; &nbsp; ';
+        			$out.= $langs->trans("EMail").':&lt;<input type="text" id="frommail" name="frommail" size="32" value="'.$this->frommail.'" />&gt;';
+        			$out.= "</td></tr>\n";
+        		}
+        	}
+
+        	// Replyto
+        	if (! empty($this->withreplyto))
+        	{
+        		if ($this->withreplytoreadonly)
+        		{
+        			$out.= '<input type="hidden" id="replyname" name="replyname" value="'.$this->replytoname.'" />';
+        			$out.= '<input type="hidden" id="replymail" name="replymail" value="'.$this->replytomail.'" />';
+        			$out.= "<tr><td>".$langs->trans("MailReply")."</td><td>".$this->replytoname.($this->replytomail?(" &lt;".$this->replytomail."&gt;"):"");
+        			$out.= "</td></tr>\n";
+        		}
+        	}
+
+        	// Errorsto
+        	if (! empty($this->witherrorsto))
+        	{
+        		//if (! $this->errorstomail) $this->errorstomail=$this->frommail;
+        		$errorstomail = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? $conf->global->MAIN_MAIL_ERRORS_TO : $this->errorstomail);
+        		if ($this->witherrorstoreadonly)
+        		{
+        			$out.= '<input type="hidden" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
+        			$out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
+        			$out.= $errorstomail;
+        			$out.= "</td></tr>\n";
+        		}
+        		else
+        		{
+        			$out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
+        			$out.= '<input size="30" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
+        			$out.= "</td></tr>\n";
+        		}
+        	}
+
+        	// To
+        	if (! empty($this->withto) || is_array($this->withto))
+        	{
+        		$out.= '<tr><td width="180">';
+        		if ($this->withtofree) $out.= $form->textwithpicto($langs->trans("MailTo"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+        		else $out.= $langs->trans("MailTo");
+        		$out.= '</td><td>';
+        		if ($this->withtoreadonly)
+        		{
+        			if (! empty($this->toname) && ! empty($this->tomail))
+        			{
+        				$out.= '<input type="hidden" id="toname" name="toname" value="'.$this->toname.'" />';
+        				$out.= '<input type="hidden" id="tomail" name="tomail" value="'.$this->tomail.'" />';
+        				if ($this->totype == 'thirdparty')
+        				{
+        					$soc=new Societe($this->db);
+        					$soc->fetch($this->toid);
+        					$out.= $soc->getNomUrl(1);
+        				}
+        				else if ($this->totype == 'contact')
+        				{
+        					$contact=new Contact($this->db);
+        					$contact->fetch($this->toid);
+        					$out.= $contact->getNomUrl(1);
+        				}
+        				else
+        				{
+        					$out.= $this->toname;
+        				}
+        				$out.= ' &lt;'.$this->tomail.'&gt;';
+        				if ($this->withtofree)
+        				{
+        					$out.= '<br>'.$langs->trans("or").' <input size="'.(is_array($this->withto)?"30":"60").'" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
+        				}
+        			}
+        			else
+        			{
+        				$out.= (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
+        			}
+        		}
+        		else
+        		{
+        			if (! empty($this->withtofree))
+        			{
+        				$out.= '<input size="'.(is_array($this->withto)?"30":"60").'" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
+        			}
+        			if (! empty($this->withto) && is_array($this->withto))
+        			{
+        				if (! empty($this->withtofree)) $out.= " ".$langs->trans("or")." ";
+        				$out.= $form->selectarray("receiver", $this->withto, GETPOST("receiver"), 1);
+        			}
+        			if (isset($this->withtosocid) && $this->withtosocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
+        			{
+        				$liste=array();
+        				$soc=new Societe($this->db);
+        				$soc->fetch($this->withtosocid);
+        				foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
+        				{
+        					$liste[$key]=$value;
+        				}
+        				if ($this->withtofree) $out.= " ".$langs->trans("or")." ";
+        				$out.= $form->selectarray("receiver", $liste, GETPOST("receiver"), 1);
+        			}
+        		}
+        		$out.= "</td></tr>\n";
+        	}
+
+        	// CC
+        	if (! empty($this->withtocc) || is_array($this->withtocc))
+        	{
+        		$out.= '<tr><td width="180">';
+        		$out.= $form->textwithpicto($langs->trans("MailCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+        		$out.= '</td><td>';
+        		if ($this->withtoccreadonly)
+        		{
+        			$out.= (! is_array($this->withtocc) && ! is_numeric($this->withtocc))?$this->withtocc:"";
+        		}
+        		else
+        		{
+        			$out.= '<input size="'.(is_array($this->withtocc)?"30":"60").'" id="sendtocc" name="sendtocc" value="'.((! is_array($this->withtocc) && ! is_numeric($this->withtocc))? (isset($_POST["sendtocc"])?$_POST["sendtocc"]:$this->withtocc) : (isset($_POST["sendtocc"])?$_POST["sendtocc"]:"") ).'" />';
+        			if (! empty($this->withto) && is_array($this->withto))
+        			{
+        				$out.= " ".$langs->trans("or")." ";
+        				$out.= $form->selectarray("receivercc", $this->withto, GETPOST("receivercc"), 1);
+        			}
+        			if (! empty($this->withtoccsocid) && $this->withtoccsocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
+        			{
+        				$liste=array();
+        				$soc=new Societe($this->db);
+        				$soc->fetch($this->withtoccsocid);
+        				foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
+        				{
+        					$liste[$key]=$value;
+        				}
+        				$out.= " ".$langs->trans("or")." ";
+        				$out.= $form->selectarray("receivercc", $liste, GETPOST("receivercc"), 1);
+        			}
+        		}
+        		$out.= "</td></tr>\n";
+        	}
+
+        	// CCC
+        	if (! empty($this->withtoccc) || is_array($this->withtoccc))
+        	{
+        		$out.= '<tr><td width="180">';
+        		$out.= $form->textwithpicto($langs->trans("MailCCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+        		$out.= '</td><td>';
+        		if (! empty($this->withtocccreadonly))
+        		{
+        			$out.= (! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))?$this->withtoccc:"";
+        		}
+        		else
+        		{
+        			$out.= '<input size="'.(is_array($this->withtoccc)?"30":"60").'" id="sendtoccc" name="sendtoccc" value="'.((! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))? (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:$this->withtoccc) : (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:"") ).'" />';
+        			if (! empty($this->withto) && is_array($this->withto))
+        			{
+        				$out.= " ".$langs->trans("or")." ";
+        				$out.= $form->selectarray("receiverccc", $this->withto, GETPOST("receiverccc"), 1);
+        			}
+        			if (! empty($this->withtocccsocid) && $this->withtocccsocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
+        			{
+        				$liste=array();
+        				$soc=new Societe($this->db);
+        				$soc->fetch($this->withtosocid);
+        				foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
+        				{
+        					$liste[$key]=$value;
+        				}
+        				$out.= " ".$langs->trans("or")." ";
+        				$out.= $form->selectarray("receiverccc", $liste, GETPOST("receiverccc"), 1);
+        			}
+        		}
+        		//if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print ' '.info_admin("+ ".$conf->global->MAIN_MAIL_AUTOCOPY_TO,1);
+        		$out.= "</td></tr>\n";
+        	}
+
+        	// Ask delivery receipt
+        	if (! empty($this->withdeliveryreceipt))
+        	{
+        		$out.= '<tr><td width="180">'.$langs->trans("DeliveryReceipt").'</td><td>';
+
+        		if (! empty($this->withdeliveryreceiptreadonly))
+        		{
+        			$out.= yn($this->withdeliveryreceipt);
+        		}
+        		else
+        		{
+        			$out.= $form->selectyesno('deliveryreceipt', (isset($_POST["deliveryreceipt"])?$_POST["deliveryreceipt"]:0), 1);
+        		}
+
+        		$out.= "</td></tr>\n";
+        	}
+
+        	// Topic
+        	if (! empty($this->withtopic))
+        	{
+        		$this->withtopic=make_substitutions($this->withtopic,$this->substit);
+
+        		$out.= '<tr>';
+        		$out.= '<td width="180">'.$langs->trans("MailTopic").'</td>';
+        		$out.= '<td>';
+        		if ($this->withtopicreadonly)
+        		{
+        			$out.= $this->withtopic;
+        			$out.= '<input type="hidden" size="60" id="subject" name="subject" value="'.$this->withtopic.'" />';
+        		}
+        		else
+        		{
+        			$out.= '<input type="text" size="60" id="subject" name="subject" value="'. (isset($_POST["subject"])?$_POST["subject"]:$this->withtopic) .'" />';
+        		}
+        		$out.= "</td></tr>\n";
+        	}
+
+        	// Attached files
+        	if (! empty($this->withfile))
+        	{
+        		$out.= '<tr>';
+        		$out.= '<td width="180">'.$langs->trans("MailFile").'</td>';
+        		$out.= '<td>';
+        		// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
+        		$out.= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
+        		$out.= '<script type="text/javascript" language="javascript">';
+        		$out.= 'jQuery(document).ready(function () {';
+        		$out.= '    jQuery(".removedfile").click(function() {';
+        		$out.= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
+        		$out.= '    });';
+        		$out.= '})';
+        		$out.= '</script>'."\n";
+        		if (count($listofpaths))
+        		{
+        			foreach($listofpaths as $key => $val)
+        			{
+        				$out.= '<div id="attachfile_'.$key.'">';
+        				$out.= img_mime($listofnames[$key]).' '.$listofnames[$key];
+        				if (! $this->withfilereadonly)
+        				{
+        					$out.= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
+        					//$out.= ' <a href="'.$_SERVER["PHP_SELF"].'?removedfile='.($key+1).' id="removedfile_'.$key.'">'.img_delete($langs->trans("Delete").'</a>';
+        				}
+        				$out.= '<br></div>';
+        			}
+        		}
+        		else
+        		{
+        			$out.= $langs->trans("NoAttachedFiles").'<br>';
+        		}
+        		if ($this->withfile == 2)	// Can add other files
+        		{
+        			$out.= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
+        			$out.= ' ';
+        			$out.= '<input type="submit" class="button" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
+        		}
+        		$out.= "</td></tr>\n";
+        	}
+
+        	// Message
+        	if (! empty($this->withbody))
+        	{
+        		$defaultmessage="";
+
+        		// TODO    A partir du type, proposer liste de messages dans table llx_models
+        		if     ($this->param["models"]=='facture_send')	            { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoice"); }
+        		elseif ($this->param["models"]=='facture_relance')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
+        		elseif ($this->param["models"]=='propal_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); }
+        		elseif ($this->param["models"]=='order_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
+        		elseif ($this->param["models"]=='order_supplier_send')		{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
+        		elseif ($this->param["models"]=='invoice_supplier_send')	{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
+        		elseif ($this->param["models"]=='shipping_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendShipping"); }
+        		elseif ($this->param["models"]=='fichinter_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendFichInter"); }
+        		elseif (! is_numeric($this->withbody))                      { $defaultmessage=$this->withbody; }
+
+        		// Complete substitution array
+        		if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_ADD_PAYMENT_URL))
+        		{
+        			require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
+
+        			$langs->load('paypal');
+
+        			if ($this->param["models"]=='order_send')
+        			{
+        				$url=getPaypalPaymentUrl(0,'order',$this->substit['__ORDERREF__']);
+        				$this->substit['__PERSONALIZED__']=$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url);
+        			}
+        			if ($this->param["models"]=='facture_send')
+        			{
+        				$url=getPaypalPaymentUrl(0,'invoice',$this->substit['__FACREF__']);
+        				$this->substit['__PERSONALIZED__']=$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url);
+        			}
+        		}
+
+        		$defaultmessage=make_substitutions($defaultmessage,$this->substit);
+        		if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
+        		$defaultmessage=str_replace('\n',"\n",$defaultmessage);
+
+        		$out.= '<tr>';
+        		$out.= '<td width="180" valign="top">'.$langs->trans("MailText").'</td>';
+        		$out.= '<td>';
+        		if ($this->withbodyreadonly)
+        		{
+        			$out.= nl2br($defaultmessage);
+        			$out.= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />';
+        		}
+        		else
+        		{
+        			if (! isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes';
+
+        			// Editor wysiwyg
+        			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+        			$doleditor=new DolEditor('message',$defaultmessage,'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,72);
+        			$out.= $doleditor->Create(1);
+        		}
+        		$out.= "</td></tr>\n";
+        	}
+
+        	if (! empty($this->withform))
+        	{
+        		$out.= '<tr><td align="center" colspan="2"><center>';
+        		$out.= '<input class="button" type="submit" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"';
+        		// Add a javascript test to avoid to forget to submit file before sending email
+        		if ($this->withfile == 2 && $conf->use_javascript_ajax)
+        		{
+        			$out.= ' onClick="if (document.mailform.addedfile.value != \'\') { alert(\''.dol_escape_js($langs->trans("FileWasNotUploaded")).'\'); return false; } else { return true; }"';
+        		}
+        		$out.= ' />';
+        		if ($this->withcancel)
+        		{
+        			$out.= ' &nbsp; &nbsp; ';
+        			$out.= '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'" />';
+        		}
+        		$out.= '</center></td></tr>'."\n";
+        	}
+
+        	$out.= '</table>'."\n";
+
+        	if (! empty($this->withform)) $out.= '</form>'."\n";
+        	$out.= "<!-- Fin form mail -->\n";
+
+        	return $out;
         }
-
-        // From
-        if (! empty($this->withfrom))
-        {
-            if (! empty($this->withfromreadonly))
-            {
-                $out.= '<input type="hidden" id="fromname" name="fromname" value="'.$this->fromname.'" />';
-                $out.= '<input type="hidden" id="frommail" name="frommail" value="'.$this->frommail.'" />';
-                $out.= '<tr><td width="180">'.$langs->trans("MailFrom").'</td><td>';
-                if ($this->fromtype == 'user' && $this->fromid > 0)
-                {
-                    $langs->load("users");
-                    $fuser=new User($this->db);
-                    $fuser->fetch($this->fromid);
-                    $out.= $fuser->getNomUrl(1);
-                }
-                else
-                {
-                    $out.= $this->fromname;
-                }
-                if ($this->frommail)
-                {
-                    $out.= " &lt;".$this->frommail."&gt;";
-                }
-                else
-                {
-                    if ($this->fromtype)
-                    {
-                        $langs->load("errors");
-                        $out.= '<font class="warning"> &lt;'.$langs->trans("ErrorNoMailDefinedForThisUser").'&gt; </font>';
-                    }
-                }
-                $out.= "</td></tr>\n";
-                $out.= "</td></tr>\n";
-            }
-            else
-            {
-                $out.= "<tr><td>".$langs->trans("MailFrom")."</td><td>";
-                $out.= $langs->trans("Name").':<input type="text" id="fromname" name="fromname" size="32" value="'.$this->fromname.'" />';
-                $out.= '&nbsp; &nbsp; ';
-                $out.= $langs->trans("EMail").':&lt;<input type="text" id="frommail" name="frommail" size="32" value="'.$this->frommail.'" />&gt;';
-                $out.= "</td></tr>\n";
-            }
-        }
-
-        // Replyto
-        if (! empty($this->withreplyto))
-        {
-            if ($this->withreplytoreadonly)
-            {
-                $out.= '<input type="hidden" id="replyname" name="replyname" value="'.$this->replytoname.'" />';
-                $out.= '<input type="hidden" id="replymail" name="replymail" value="'.$this->replytomail.'" />';
-                $out.= "<tr><td>".$langs->trans("MailReply")."</td><td>".$this->replytoname.($this->replytomail?(" &lt;".$this->replytomail."&gt;"):"");
-                $out.= "</td></tr>\n";
-            }
-        }
-
-        // Errorsto
-        if (! empty($this->witherrorsto))
-        {
-            //if (! $this->errorstomail) $this->errorstomail=$this->frommail;
-            $errorstomail = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? $conf->global->MAIN_MAIL_ERRORS_TO : $this->errorstomail);
-            if ($this->witherrorstoreadonly)
-            {
-                $out.= '<input type="hidden" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
-                $out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
-                $out.= $errorstomail;
-                $out.= "</td></tr>\n";
-            }
-            else
-            {
-                $out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
-                $out.= '<input size="30" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
-                $out.= "</td></tr>\n";
-            }
-        }
-
-        // To
-        if (! empty($this->withto) || is_array($this->withto))
-        {
-            $out.= '<tr><td width="180">';
-            if ($this->withtofree) $out.= $form->textwithpicto($langs->trans("MailTo"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
-            else $out.= $langs->trans("MailTo");
-            $out.= '</td><td>';
-            if ($this->withtoreadonly)
-            {
-                if (! empty($this->toname) && ! empty($this->tomail))
-                {
-                    $out.= '<input type="hidden" id="toname" name="toname" value="'.$this->toname.'" />';
-                    $out.= '<input type="hidden" id="tomail" name="tomail" value="'.$this->tomail.'" />';
-                    if ($this->totype == 'thirdparty')
-                    {
-                        $soc=new Societe($this->db);
-                        $soc->fetch($this->toid);
-                        $out.= $soc->getNomUrl(1);
-                    }
-                    else if ($this->totype == 'contact')
-                    {
-                        $contact=new Contact($this->db);
-                        $contact->fetch($this->toid);
-                        $out.= $contact->getNomUrl(1);
-                    }
-                    else
-                    {
-                        $out.= $this->toname;
-                    }
-                    $out.= ' &lt;'.$this->tomail.'&gt;';
-                    if ($this->withtofree)
-                    {
-                        $out.= '<br>'.$langs->trans("or").' <input size="'.(is_array($this->withto)?"30":"60").'" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
-                    }
-                }
-                else
-                {
-                    $out.= (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
-                }
-            }
-            else
-            {
-                if (! empty($this->withtofree))
-                {
-                    $out.= '<input size="'.(is_array($this->withto)?"30":"60").'" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
-                }
-                if (! empty($this->withto) && is_array($this->withto))
-                {
-                    if (! empty($this->withtofree)) $out.= " ".$langs->trans("or")." ";
-                    $out.= $form->selectarray("receiver", $this->withto, GETPOST("receiver"), 1);
-                }
-                if (isset($this->withtosocid) && $this->withtosocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
-                {
-                    $liste=array();
-                    $soc=new Societe($this->db);
-                    $soc->fetch($this->withtosocid);
-                    foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
-                    {
-                        $liste[$key]=$value;
-                    }
-                    if ($this->withtofree) $out.= " ".$langs->trans("or")." ";
-                    $out.= $form->selectarray("receiver", $liste, GETPOST("receiver"), 1);
-                }
-            }
-            $out.= "</td></tr>\n";
-        }
-
-        // CC
-        if (! empty($this->withtocc) || is_array($this->withtocc))
-        {
-            $out.= '<tr><td width="180">';
-            $out.= $form->textwithpicto($langs->trans("MailCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
-            $out.= '</td><td>';
-            if ($this->withtoccreadonly)
-            {
-                $out.= (! is_array($this->withtocc) && ! is_numeric($this->withtocc))?$this->withtocc:"";
-            }
-            else
-            {
-                $out.= '<input size="'.(is_array($this->withtocc)?"30":"60").'" id="sendtocc" name="sendtocc" value="'.((! is_array($this->withtocc) && ! is_numeric($this->withtocc))? (isset($_POST["sendtocc"])?$_POST["sendtocc"]:$this->withtocc) : (isset($_POST["sendtocc"])?$_POST["sendtocc"]:"") ).'" />';
-                if (! empty($this->withto) && is_array($this->withto))
-                {
-                    $out.= " ".$langs->trans("or")." ";
-                    $out.= $form->selectarray("receivercc", $this->withto, GETPOST("receivercc"), 1);
-                }
-                if (! empty($this->withtoccsocid) && $this->withtoccsocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
-                {
-                    $liste=array();
-                    $soc=new Societe($this->db);
-                    $soc->fetch($this->withtoccsocid);
-                    foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
-                    {
-                        $liste[$key]=$value;
-                    }
-                    $out.= " ".$langs->trans("or")." ";
-                    $out.= $form->selectarray("receivercc", $liste, GETPOST("receivercc"), 1);
-                }
-            }
-            $out.= "</td></tr>\n";
-        }
-
-        // CCC
-        if (! empty($this->withtoccc) || is_array($this->withtoccc))
-        {
-            $out.= '<tr><td width="180">';
-            $out.= $form->textwithpicto($langs->trans("MailCCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
-            $out.= '</td><td>';
-            if (! empty($this->withtocccreadonly))
-            {
-                $out.= (! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))?$this->withtoccc:"";
-            }
-            else
-            {
-                $out.= '<input size="'.(is_array($this->withtoccc)?"30":"60").'" id="sendtoccc" name="sendtoccc" value="'.((! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))? (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:$this->withtoccc) : (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:"") ).'" />';
-                if (! empty($this->withto) && is_array($this->withto))
-                {
-                    $out.= " ".$langs->trans("or")." ";
-                    $out.= $form->selectarray("receiverccc", $this->withto, GETPOST("receiverccc"), 1);
-                }
-                if (! empty($this->withtocccsocid) && $this->withtocccsocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
-                {
-                    $liste=array();
-                    $soc=new Societe($this->db);
-                    $soc->fetch($this->withtosocid);
-                    foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
-                    {
-                        $liste[$key]=$value;
-                    }
-                    $out.= " ".$langs->trans("or")." ";
-                    $out.= $form->selectarray("receiverccc", $liste, GETPOST("receiverccc"), 1);
-                }
-            }
-            //if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print ' '.info_admin("+ ".$conf->global->MAIN_MAIL_AUTOCOPY_TO,1);
-            $out.= "</td></tr>\n";
-        }
-
-        // Ask delivery receipt
-        if (! empty($this->withdeliveryreceipt))
-        {
-            $out.= '<tr><td width="180">'.$langs->trans("DeliveryReceipt").'</td><td>';
-
-            if (! empty($this->withdeliveryreceiptreadonly))
-            {
-                $out.= yn($this->withdeliveryreceipt);
-            }
-            else
-            {
-                $out.= $form->selectyesno('deliveryreceipt', (isset($_POST["deliveryreceipt"])?$_POST["deliveryreceipt"]:0), 1);
-            }
-
-            $out.= "</td></tr>\n";
-        }
-
-        // Topic
-        if (! empty($this->withtopic))
-        {
-            $this->withtopic=make_substitutions($this->withtopic,$this->substit);
-
-            $out.= '<tr>';
-            $out.= '<td width="180">'.$langs->trans("MailTopic").'</td>';
-            $out.= '<td>';
-            if ($this->withtopicreadonly)
-            {
-                $out.= $this->withtopic;
-                $out.= '<input type="hidden" size="60" id="subject" name="subject" value="'.$this->withtopic.'" />';
-            }
-            else
-            {
-                $out.= '<input type="text" size="60" id="subject" name="subject" value="'. (isset($_POST["subject"])?$_POST["subject"]:$this->withtopic) .'" />';
-            }
-            $out.= "</td></tr>\n";
-        }
-
-        // Attached files
-        if (! empty($this->withfile))
-        {
-            $out.= '<tr>';
-            $out.= '<td width="180">'.$langs->trans("MailFile").'</td>';
-            $out.= '<td>';
-            // TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
-            $out.= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
-            $out.= '<script type="text/javascript" language="javascript">';
-            $out.= 'jQuery(document).ready(function () {';
-            $out.= '    jQuery(".removedfile").click(function() {';
-            $out.= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
-            $out.= '    });';
-            $out.= '})';
-            $out.= '</script>'."\n";
-            if (count($listofpaths))
-            {
-                foreach($listofpaths as $key => $val)
-                {
-                    $out.= '<div id="attachfile_'.$key.'">';
-                    $out.= img_mime($listofnames[$key]).' '.$listofnames[$key];
-                    if (! $this->withfilereadonly)
-                    {
-                        $out.= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
-                        //$out.= ' <a href="'.$_SERVER["PHP_SELF"].'?removedfile='.($key+1).' id="removedfile_'.$key.'">'.img_delete($langs->trans("Delete").'</a>';
-                    }
-                    $out.= '<br></div>';
-                }
-            }
-            else
-            {
-                $out.= $langs->trans("NoAttachedFiles").'<br>';
-            }
-            if ($this->withfile == 2)	// Can add other files
-            {
-                $out.= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
-                $out.= ' ';
-                $out.= '<input type="submit" class="button" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
-            }
-            $out.= "</td></tr>\n";
-        }
-
-        // Message
-        if (! empty($this->withbody))
-        {
-            $defaultmessage="";
-
-            // TODO    A partir du type, proposer liste de messages dans table llx_models
-            if     ($this->param["models"]=='facture_send')	            { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoice"); }
-            elseif ($this->param["models"]=='facture_relance')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
-            elseif ($this->param["models"]=='propal_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); }
-            elseif ($this->param["models"]=='order_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
-            elseif ($this->param["models"]=='order_supplier_send')		{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
-            elseif ($this->param["models"]=='invoice_supplier_send')	{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
-            elseif ($this->param["models"]=='shipping_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendShipping"); }
-            elseif ($this->param["models"]=='fichinter_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendFichInter"); }
-            elseif (! is_numeric($this->withbody))                      { $defaultmessage=$this->withbody; }
-
-            // Complete substitution array
-            if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_ADD_PAYMENT_URL))
-            {
-                require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
-
-                $langs->load('paypal');
-
-                if ($this->param["models"]=='order_send')
-                {
-                    $url=getPaypalPaymentUrl(0,'order',$this->substit['__ORDERREF__']);
-                    $this->substit['__PERSONALIZED__']=$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url);
-                }
-                if ($this->param["models"]=='facture_send')
-                {
-                    $url=getPaypalPaymentUrl(0,'invoice',$this->substit['__FACREF__']);
-                    $this->substit['__PERSONALIZED__']=$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url);
-                }
-            }
-
-            $defaultmessage=make_substitutions($defaultmessage,$this->substit);
-            if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
-            $defaultmessage=str_replace('\n',"\n",$defaultmessage);
-
-            $out.= '<tr>';
-            $out.= '<td width="180" valign="top">'.$langs->trans("MailText").'</td>';
-            $out.= '<td>';
-            if ($this->withbodyreadonly)
-            {
-                $out.= nl2br($defaultmessage);
-                $out.= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />';
-            }
-            else
-            {
-            	if (! isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes';
-
-                // Editor wysiwyg
-                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-                $doleditor=new DolEditor('message',$defaultmessage,'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,72);
-                $out.= $doleditor->Create(1);
-            }
-            $out.= "</td></tr>\n";
-        }
-
-        if (! empty($this->withform))
-        {
-            $out.= '<tr><td align="center" colspan="2"><center>';
-            $out.= '<input class="button" type="submit" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"';
-            // Add a javascript test to avoid to forget to submit file before sending email
-            if ($this->withfile == 2 && $conf->use_javascript_ajax)
-            {
-                $out.= ' onClick="if (document.mailform.addedfile.value != \'\') { alert(\''.dol_escape_js($langs->trans("FileWasNotUploaded")).'\'); return false; } else { return true; }"';
-            }
-            $out.= ' />';
-            if ($this->withcancel)
-            {
-                $out.= ' &nbsp; &nbsp; ';
-                $out.= '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'" />';
-            }
-            $out.= '</center></td></tr>'."\n";
-        }
-
-        $out.= '</table>'."\n";
-
-        if (! empty($this->withform)) $out.= '</form>'."\n";
-        $out.= "<!-- Fin form mail -->\n";
-
-        return $out;
     }
 }
 

From 8ab450f69b50e78f34adf496c5a54b959552b8db Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <mko@atm-consulting.fr>
Date: Thu, 24 Jan 2013 17:54:51 +0100
Subject: [PATCH 023/162] Multicompany restriction for transverse mode not used
 anymore. RestrictedArea is enough

---
 htdocs/user/fiche.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 6172b08c740..7ce2640710a 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -67,12 +67,6 @@ if ($id)
     || (($user->id != $id) && $user->rights->user->user->password));
 }
 
-//Multicompany in mode transversal
-if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->multicompany->transverse_mode)
-{
-    accessforbidden();
-}
-
 // Security check
 $socid=0;
 if ($user->societe_id > 0) $socid = $user->societe_id;

From 7facbf7aa275694cd52b12ccc2eb5df8a1f65e55 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <mko@atm-consulting.fr>
Date: Thu, 24 Jan 2013 17:54:51 +0100
Subject: [PATCH 024/162] Multicompany restriction for transverse mode not used
 anymore. RestrictedArea is enough

---
 htdocs/user/fiche.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index bc0caf8d469..222ab62b846 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -67,12 +67,6 @@ if ($id)
     || (($user->id != $id) && $user->rights->user->user->password));
 }
 
-//Multicompany in mode transversal
-if (! empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->multicompany->transverse_mode)
-{
-    accessforbidden();
-}
-
 // Security check
 $socid=0;
 if ($user->societe_id > 0) $socid = $user->societe_id;

From 70b21172f9090635b953fb17cccfc426b2fe9a71 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 25 Jan 2013 11:05:44 +0100
Subject: [PATCH 025/162] Qual: Removed not used and deprecated property

---
 htdocs/core/menus/smartphone/smartphone_backoffice.php  | 2 --
 htdocs/core/menus/smartphone/smartphone_frontoffice.php | 1 -
 htdocs/core/menus/standard/auguria_backoffice.php       | 1 -
 htdocs/core/menus/standard/auguria_frontoffice.php      | 1 -
 htdocs/core/menus/standard/eldy_backoffice.php          | 1 -
 htdocs/core/menus/standard/eldy_frontoffice.php         | 1 -
 htdocs/core/menus/standard/empty.php                    | 1 -
 7 files changed, 8 deletions(-)

diff --git a/htdocs/core/menus/smartphone/smartphone_backoffice.php b/htdocs/core/menus/smartphone/smartphone_backoffice.php
index a909cce6826..e0144c6913f 100755
--- a/htdocs/core/menus/smartphone/smartphone_backoffice.php
+++ b/htdocs/core/menus/smartphone/smartphone_backoffice.php
@@ -28,8 +28,6 @@
 class MenuSmart
 {
 	var $db;
-	var $require_left=array("smartphone_backoffice");     // Si doit etre en phase avec un gestionnaire de menu particulier
-	var $hideifnotallowed=0;						// Put 0 for back office menu, 1 for front office menu
 	var $atarget="";                                // Valeur du target a utiliser dans les liens
 
 
diff --git a/htdocs/core/menus/smartphone/smartphone_frontoffice.php b/htdocs/core/menus/smartphone/smartphone_frontoffice.php
index 4c17eca4447..9120537fa5b 100755
--- a/htdocs/core/menus/smartphone/smartphone_frontoffice.php
+++ b/htdocs/core/menus/smartphone/smartphone_frontoffice.php
@@ -28,7 +28,6 @@
 class MenuSmart
 {
 
-	var $require_left=array("smartphone_frontoffice");    // Si doit etre en phase avec un gestionnaire de menu particulier
 	var $hideifnotallowed=1;						// Put 0 for back office menu, 1 for front office menu
 	var $atarget="";                                // Valeur du target a utiliser dans les liens
 
diff --git a/htdocs/core/menus/standard/auguria_backoffice.php b/htdocs/core/menus/standard/auguria_backoffice.php
index 3c05a0f6170..a22c40ed315 100644
--- a/htdocs/core/menus/standard/auguria_backoffice.php
+++ b/htdocs/core/menus/standard/auguria_backoffice.php
@@ -34,7 +34,6 @@
 class MenuManager
 {
 	var $db;
-	var $require_left=array("auguria_backoffice");  // Si doit etre en phase avec un gestionnaire de menu gauche particulier
 	var $type_user=0;								// Put 0 for internal users, 1 for external users
 	var $atarget="";                                // Valeur du target a utiliser dans les liens
 
diff --git a/htdocs/core/menus/standard/auguria_frontoffice.php b/htdocs/core/menus/standard/auguria_frontoffice.php
index 151abfbe9cc..cb8299feee3 100644
--- a/htdocs/core/menus/standard/auguria_frontoffice.php
+++ b/htdocs/core/menus/standard/auguria_frontoffice.php
@@ -34,7 +34,6 @@
 class MenuManager
 {
 	var $db;
-	var $require_left=array("auguria_backoffice");	// Si doit etre en phase avec un gestionnaire de menu gauche particulier
 	var $type_user=1;								// Put 0 for internal users, 1 for external users
 	var $atarget="";                                // Valeur du target a utiliser dans les liens
 
diff --git a/htdocs/core/menus/standard/eldy_backoffice.php b/htdocs/core/menus/standard/eldy_backoffice.php
index ab00caccb3a..638fd45664d 100644
--- a/htdocs/core/menus/standard/eldy_backoffice.php
+++ b/htdocs/core/menus/standard/eldy_backoffice.php
@@ -33,7 +33,6 @@
 class MenuManager
 {
 	var $db;
-	var $require_left=array("eldy_backoffice");     // Si doit etre en phase avec un gestionnaire de menu gauche particulier
 	var $type_user=0;								// Put 0 for internal users, 1 for external users
 	var $atarget="";                                // Valeur du target a utiliser dans les liens
 
diff --git a/htdocs/core/menus/standard/eldy_frontoffice.php b/htdocs/core/menus/standard/eldy_frontoffice.php
index 5ec673afe68..2221e0ec9f0 100644
--- a/htdocs/core/menus/standard/eldy_frontoffice.php
+++ b/htdocs/core/menus/standard/eldy_frontoffice.php
@@ -33,7 +33,6 @@
 class MenuManager
 {
 	var $db;
-	var $require_left=array("eldy_frontoffice");    // Si doit etre en phase avec un gestionnaire de menu gauche particulier
 	var $type_user=1;								// Put 0 for internal users, 1 for external users
 	var $atarget="";                                // Valeur du target a utiliser dans les liens
 
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index da3eab44025..705dc2cf293 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -26,7 +26,6 @@
 class MenuManager
 {
 	var $db;
-	var $require_left=array("empty");   // If this top menu handler must be used with a particular left menu handler
 	var $type_user=0;					// Put 0 for internal users, 1 for external users
 	var $atarget="";               		// To store arget to use in menu links
 

From ad3645f7f4e654a1464e3c44cb9f2863b17fc70c Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Thu, 24 Jan 2013 12:53:42 +0100
Subject: [PATCH 026/162] Fix:  [ bug #698 ] Bad calculation of totals of
 associated documents

---
 htdocs/comm/propal/tpl/linkedobjectblock.tpl.php    | 4 +++-
 htdocs/commande/tpl/linkedobjectblock.tpl.php       | 4 +++-
 htdocs/compta/facture/tpl/linkedobjectblock.tpl.php | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index 4337611066e..e9ad176a86d 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2010-2011  Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Juanjo Menent <jmenent@2byte.es>
  *
  * 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
@@ -37,6 +38,7 @@ print_titre($langs->trans('RelatedCommercialProposals'));
 </tr>
 <?php
 $var=true;
+$total=0;
 foreach($linkedObjectBlock as $object)
 {
 	$var=!$var;
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index f5bf3f8ccce..c7d073501a3 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2010-2011	Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Juanjo Menent <jmenent@2byte.es>
  *
  * 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
@@ -38,6 +39,7 @@ print_titre($langs->trans('RelatedOrders'));
 </tr>
 <?php
 $var=true;
+$total=0;
 foreach($linkedObjectBlock as $object)
 {
 	$var=!$var;
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index b36bffb3c68..f0fca0b90ff 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2010-2011	Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013		Juanjo Menent <jmenent@2byte.es>
  *
  * 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
@@ -38,6 +39,7 @@ else print_titre($langs->trans("RelatedBill"));
 </tr>
 <?php
 $var=true;
+$total=0;
 foreach($linkedObjectBlock as $object)
 {
 	$var=!$var;

From 7983b1dec564771b8af90a1a91ebe66a9333584c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 25 Jan 2013 12:37:03 +0100
Subject: [PATCH 027/162] Fix: wrong object name

---
 htdocs/fourn/facture/fiche.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index b093d290a01..241c17b7cef 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -2078,7 +2078,7 @@ else
             $formmail->frommail = $user->email;
             $formmail->withfrom=1;
             $formmail->withto=empty($_POST["sendto"])?1:$_POST["sendto"];
-            $formmail->withtosocid=$soc->id;
+            $formmail->withtosocid=$societe->id;
             $formmail->withtocc=1;
             $formmail->withtoccsocid=0;
             $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;

From e3be718a571627add1c1c6153d10a78cd4d87625 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Fri, 25 Jan 2013 12:37:03 +0100
Subject: [PATCH 028/162] Fix: wrong object name

---
 htdocs/fourn/facture/fiche.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 99e1bf5da0a..936fbd08572 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -2078,7 +2078,7 @@ else
             $formmail->frommail = $user->email;
             $formmail->withfrom=1;
             $formmail->withto=empty($_POST["sendto"])?1:$_POST["sendto"];
-            $formmail->withtosocid=$soc->id;
+            $formmail->withtosocid=$societe->id;
             $formmail->withtocc=1;
             $formmail->withtoccsocid=0;
             $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;

From b11441555c90d2143288508abb424cc1bd66e7d0 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <mko@atm-consulting.fr>
Date: Fri, 25 Jan 2013 15:39:26 +0100
Subject: [PATCH 029/162] LDAP : Add SID sync in user creation

---
 scripts/user/sync_users_ldap2dolibarr.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php
index 758440e201e..036d45f79a6 100755
--- a/scripts/user/sync_users_ldap2dolibarr.php
+++ b/scripts/user/sync_users_ldap2dolibarr.php
@@ -200,6 +200,7 @@ if ($result >= 0)
 			$fuser->user_mobile=$ldapuser[$conf->global->LDAP_FIELD_MOBILE];
 			$fuser->office_fax=$ldapuser[$conf->global->LDAP_FIELD_FAX];
 			$fuser->email=$ldapuser[$conf->global->LDAP_FIELD_MAIL];
+			$fuser->ldap_sid=$ldapuser[$conf->global->LDAP_FIELD_SID];
 
 			$fuser->job=$ldapuser[$conf->global->LDAP_FIELD_TITLE];
 			$fuser->note=$ldapuser[$conf->global->LDAP_FIELD_DESCRIPTION];

From 2aa548560b7c9b1390c206801cc883dcdf7a30a1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 25 Jan 2013 16:52:23 +0100
Subject: [PATCH 030/162] doc: Update exemples

---
 dev/skeletons/modMyModule.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php
index 4d7bf0df4ae..355964273f2 100644
--- a/dev/skeletons/modMyModule.class.php
+++ b/dev/skeletons/modMyModule.class.php
@@ -106,7 +106,7 @@ class modMyModule extends DolibarrModules
 		// Constants
 		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
 		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
-		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0)
+		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
 		// );
 		$this->const = array();
 

From c2d334624b1b8bb26d7ef0a49b10292a9e9f3f46 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 25 Jan 2013 17:44:23 +0100
Subject: [PATCH 031/162] Qual: Simplify system for menu manager. Only one
 file, one class per manager.

---
 ChangeLog                                     |  5 +-
 htdocs/admin/menus.php                        |  4 -
 htdocs/core/class/html.formadmin.class.php    |  8 +-
 .../smartphone/smartphone_backoffice.php      | 60 ---------------
 ...ne_frontoffice.php => smartphone_menu.php} | 38 ++++++----
 .../menus/standard/auguria_backoffice.php     | 74 -------------------
 ...guria_frontoffice.php => auguria_menu.php} | 35 ++++-----
 .../core/menus/standard/eldy_frontoffice.php  | 33 +++++----
 .../{eldy_backoffice.php => eldy_menu.php}    | 38 ++++++----
 .../install/mysql/migration/3.3.0-3.4.0.sql   |  8 ++
 htdocs/langs/en_US/main.lang                  |  1 +
 htdocs/langs/fr_FR/main.lang                  |  1 +
 htdocs/main.inc.php                           | 19 +++--
 13 files changed, 111 insertions(+), 213 deletions(-)
 delete mode 100755 htdocs/core/menus/smartphone/smartphone_backoffice.php
 rename htdocs/core/menus/smartphone/{smartphone_frontoffice.php => smartphone_menu.php} (57%)
 delete mode 100644 htdocs/core/menus/standard/auguria_backoffice.php
 rename htdocs/core/menus/standard/{auguria_frontoffice.php => auguria_menu.php} (63%)
 rename htdocs/core/menus/standard/{eldy_backoffice.php => eldy_menu.php} (63%)

diff --git a/ChangeLog b/ChangeLog
index 46f482aeab9..8775d808037 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,9 +4,12 @@ English Dolibarr ChangeLog
 
 ***** ChangeLog for 3.4 compared to 3.3 *****
 For users:
-- New: Some performance enhancements
+- New: Some performance enhancements.
+- New: Can attach files onto trip and expenses modules.
 
 For developers:
+- System of menu managers has been rewritten to reduce code to do same things. 
+- An external module can force its theme.
 
 For translators:
 
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index 23eade151a1..e40af9b75dc 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -77,10 +77,6 @@ if ($action == 'update' && empty($_POST["cancel"]))
 
 	// Define list of menu handlers to initialize
 	$listofmenuhandler=array();
-	$listofmenuhandler[preg_replace('/((_back|_front)office)?\.php/i','',$_POST["MAIN_MENU_STANDARD"])]=1;
-	$listofmenuhandler[preg_replace('/((_back|_front)office)?\.php/i','',$_POST["MAIN_MENUFRONT_STANDARD"])]=1;
-	if (isset($_POST["MAIN_MENU_SMARTPHONE"]))      $listofmenuhandler[preg_replace('/((_back|_front)office)?\.php/i','',$_POST["MAIN_MENU_SMARTPHONE"])]=1;
-	if (isset($_POST["MAIN_MENUFRONT_SMARTPHONE"])) $listofmenuhandler[preg_replace('/((_back|_front)office)?\.php/i','',$_POST["MAIN_MENUFRONT_SMARTPHONE"])]=1;
 
 	// Initialize menu handlers
 	foreach ($listofmenuhandler as $key => $val)
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index c60f1a81504..ccd3e038f74 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -121,7 +121,7 @@ class FormAdmin
         global $langs,$conf;
 
         // Clean parameters
-        if ($selected == 'eldy.php') $selected='eldy_backoffice.php';  // For compatibility
+
 
         // Check parameters
         if (! is_array($dirmenuarray)) return -1;
@@ -143,7 +143,11 @@ class FormAdmin
     	                    if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && substr($file, 0, 5) != 'index')
     	                    {
     	                        if (preg_match('/lib\.php$/i',$file)) continue;	// We exclude library files
-    	                    	$filelib=preg_replace('/\.php$/i','',$file);
+    	                        if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i',$file)) continue;		// We exclude all menu manager files
+    	                        if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
+    	                        if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i',$file)) continue;	// We exclude all menu manager files
+    	                        
+    	                        $filelib=preg_replace('/\.php$/i','',$file);
     	        				$prefix='';
     	        				// 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other
     	        				if (preg_match('/^eldy/i',$file)) $prefix='0';
diff --git a/htdocs/core/menus/smartphone/smartphone_backoffice.php b/htdocs/core/menus/smartphone/smartphone_backoffice.php
deleted file mode 100755
index e0144c6913f..00000000000
--- a/htdocs/core/menus/smartphone/smartphone_backoffice.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2007-2010 Regis Houssin        <regis.houssin@capnetworks.com>
- *
- * 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/core/menus/smartphone/smartphone_backoffice.php
- *		\brief      Gestionnaire nomme smartphone du menu smartphone
- */
-
-
-/**
- *	Class to manage smartphone menu smartphone (for internal users)
- */
-class MenuSmart
-{
-	var $db;
-	var $atarget="";                                // Valeur du target a utiliser dans les liens
-
-
-	/**
-     *  Constructor
-     *
-     *  @param      DoliDb		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db=$db;
-	}
-
-
-	/**
-	 *    Show menu
-	 *
-	 *    @param	string	$limitmenuto		To limit menu to a top or left menu value
-	 * 	  @return	void
-	 */
-	function showmenu($limitmenuto)
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/menus/smartphone/smartphone.lib.php';
-
-		print_smartphone_menu($this->db,$this->atarget,$this->hideifnotallowed,$limitmenuto);
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/htdocs/core/menus/smartphone/smartphone_frontoffice.php b/htdocs/core/menus/smartphone/smartphone_menu.php
similarity index 57%
rename from htdocs/core/menus/smartphone/smartphone_frontoffice.php
rename to htdocs/core/menus/smartphone/smartphone_menu.php
index 9120537fa5b..e95bdc1df09 100755
--- a/htdocs/core/menus/smartphone/smartphone_frontoffice.php
+++ b/htdocs/core/menus/smartphone/smartphone_menu.php
@@ -17,45 +17,57 @@
  */
 
 /**
- *	\file       htdocs/core/menus/smartphone/smartphone_frontoffice.php
- *	\brief      Gestionnaire nomme smartphone du menu smartphone
+ *	\file       htdocs/core/menus/smartphone/smartphone_menu.php
+ *	\brief      Menu smartphone manager
  */
 
 
 /**
- *	Class to manage smartphone menu smartphone (for external users)
+ *	Class to manage smartphone menu smartphone
  */
 class MenuSmart
 {
 
 	var $hideifnotallowed=1;						// Put 0 for back office menu, 1 for front office menu
 	var $atarget="";                                // Valeur du target a utiliser dans les liens
-
+	var $name="smartphone";
+	
 
 	/**
 	 *	Constructor
 	 *
-	 *  @param		DoliDB		$db      Database handler
+	 *  @param	DoliDB		$db      	Database handler
+     *  @param	int			$type_user	Type of user
 	 */
-	function __construct($db)
+	function __construct($db, $type_user)
 	{
 		$this->db=$db;
 	}
 
 
 	/**
-	 *    Show menu
+	 *  Show menu
 	 *
-	 *    @param	string		$limitmenuto		To limit menu to a top or left menu value
-	 *    @return	void
+     *	@param	string	$mode			'top' or 'left'
+     *  @return int     				Number of menu entries shown
 	 */
-	function showmenu($limitmenuto)
+	function showmenu($mode)
 	{
-		require_once DOL_DOCUMENT_ROOT.'/core/menus/smartphone/smartphone.lib.php';
+    	global $conf;
+		
+    	require_once DOL_DOCUMENT_ROOT.'/core/menus/smartphone/smartphone.lib.php';
 
-		print_smartphone_menu($this->db,$this->atarget,$this->hideifnotallowed,$limitmenuto);
+	    if ($this->type_user == 1)
+        {
+        	$conf->global->MAIN_SEARCHFORM_SOCIETE=0;
+        	$conf->global->MAIN_SEARCHFORM_CONTACT=0;
+        }
+    	
+        print_smartphone_menu($this->db,$this->atarget,$this->hideifnotallowed,$mode);
+        
+        return 1;
 	}
 
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/htdocs/core/menus/standard/auguria_backoffice.php b/htdocs/core/menus/standard/auguria_backoffice.php
deleted file mode 100644
index a22c40ed315..00000000000
--- a/htdocs/core/menus/standard/auguria_backoffice.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/* Copyright (C) 2007      Patrick Raguin       <patrick.raguin@gmail.com>
- * Copyright (C) 2009      Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 2008-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/>.
- */
-
-/**
- *	\file       htdocs/core/menus/standard/auguria_backoffice.php
- *	\brief      Gestionnaire nomme Auguria du menu du haut
- *
- *	\remarks    La construction d'un gestionnaire pour le menu du haut est simple:
- *	\remarks    Toutes les entrees de menu a faire apparaitre dans la barre du haut
- *	\remarks    doivent etre affichees par <a class="tmenu" href="...?mainmenu=...">...</a>
- *	\remarks    ou si menu selectionne <a class="tmenusel" href="...?mainmenu=...">...</a>
- */
-
-
-/**
- *	Classe permettant la gestion du menu du haut Auguria
- */
-class MenuManager
-{
-	var $db;
-	var $type_user=0;								// Put 0 for internal users, 1 for external users
-	var $atarget="";                                // Valeur du target a utiliser dans les liens
-
-	var $menu_array;
-	var $menu_array_after;
-
-	
-    /**
-     *  Constructor
-     *
-	 *  @param	DoliDB		$db     			Database handler
-     */
-    function __construct($db)
-    {
-        $this->db=$db;
-    }
-	
-
-    /**
-     *  Show menu
-     *
-     *	@param	string	$mode		'top' or 'left'
-     *  @return	int     			Number of menu entries shown
-     */
-    function showmenu($mode)
-    {
-		require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php';
-
-        $res='ErrorBadParameterForMode';
-        if ($mode == 'top')  $res=print_auguria_menu($this->db,$this->atarget,$this->type_user);
-        if ($mode == 'left') $res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after);
-
-        return $res;
-	}
-
-}
-
-?>
diff --git a/htdocs/core/menus/standard/auguria_frontoffice.php b/htdocs/core/menus/standard/auguria_menu.php
similarity index 63%
rename from htdocs/core/menus/standard/auguria_frontoffice.php
rename to htdocs/core/menus/standard/auguria_menu.php
index cb8299feee3..251a205290e 100644
--- a/htdocs/core/menus/standard/auguria_frontoffice.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -18,25 +18,21 @@
  */
 
 /**
- *	\file       htdocs/core/menus/standard/auguria_frontoffice.php
- *	\brief      Gestionnaire nomme Auguria du menu du haut
- *
- *	\remarks    La construction d'un gestionnaire pour le menu du haut est simple:
- *	\remarks    Toutes les entrees de menu a faire apparaitre dans la barre du haut
- *	\remarks    doivent etre affichees par <a class="tmenu" href="...?mainmenu=...">...</a>
- *	\remarks    ou si menu selectionne <a class="tmenusel" href="...?mainmenu=...">...</a>
+ *	\file       htdocs/core/menus/standard/auguria_menu.php
+ *	\brief      Menu auguria manager
  */
 
 
 /**
- *	Classe permettant la gestion du menu du haut Auguria
+ *	Class to manage menu Auguria
  */
 class MenuManager
 {
 	var $db;
-	var $type_user=1;								// Put 0 for internal users, 1 for external users
-	var $atarget="";                                // Valeur du target a utiliser dans les liens
-
+	var $type_user;								// Put 0 for internal users, 1 for external users
+	var $atarget="";                            // Valeur du target a utiliser dans les liens
+	var $name="auguria";
+	
 	var $menu_array;
 	var $menu_array_after;
 
@@ -44,11 +40,13 @@ class MenuManager
     /**
      *  Constructor
      *
-	 *  @param	DoliDB		$db     			Database handler
+	 *  @param	DoliDB		$db     	Database handler
+     *  @param	int			$type_user	Type of user
      */
-    function __construct($db)
+    function __construct($db, $type_user)
     {
-        $this->db=$db;
+    	$this->type_user=$type_user;
+    	$this->db=$db;
     }
 	
 
@@ -64,9 +62,12 @@ class MenuManager
     	
         require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php';
 
-        $conf->global->MAIN_SEARCHFORM_SOCIETE=0;
-        $conf->global->MAIN_SEARCHFORM_CONTACT=0;
-        
+        if ($this->type_user == 1)
+        {
+        	$conf->global->MAIN_SEARCHFORM_SOCIETE=0;
+	        $conf->global->MAIN_SEARCHFORM_CONTACT=0;
+        }
+            
         $res='ErrorBadParameterForMode';
         if ($mode == 'top')  $res=print_auguria_menu($this->db,$this->atarget,$this->type_user);
         if ($mode == 'left') $res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after);
diff --git a/htdocs/core/menus/standard/eldy_frontoffice.php b/htdocs/core/menus/standard/eldy_frontoffice.php
index 2221e0ec9f0..2d6d11f28dc 100644
--- a/htdocs/core/menus/standard/eldy_frontoffice.php
+++ b/htdocs/core/menus/standard/eldy_frontoffice.php
@@ -17,25 +17,21 @@
  */
 
 /**
- *	\file       htdocs/core/menus/standard/eldy_frontoffice.php
- *	\brief      Gestionnaire nomme eldy du menu du haut
- *
- *	\remarks    La construction d'un gestionnaire pour le menu du haut est simple:
- *	\remarks    Toutes les entrees de menu a faire apparaitre dans la barre du haut
- *	\remarks    doivent etre affichees par <a class="tmenu" href="...?mainmenu=...">...</a>
- *	\remarks    ou si menu selectionne <a class="tmenusel" href="...?mainmenu=...">...</a>
+ *	\file       htdocs/core/menus/standard/eldy_menu.php
+ *	\brief      Menu eldy manager
  */
 
 
 /**
- *	Class to manage menu Eldy (for external users)
+ *	Class to manage menu Eldy
  */
 class MenuManager
 {
 	var $db;
-	var $type_user=1;								// Put 0 for internal users, 1 for external users
+	var $type_user;									// Put 0 for internal users, 1 for external users
 	var $atarget="";                                // Valeur du target a utiliser dans les liens
-
+	var $name="eldy";
+	
     var $menu_array;
     var $menu_array_after;
 
@@ -43,10 +39,12 @@ class MenuManager
     /**
      *  Constructor
      *
-	 *  @param	DoliDB		$db     			Database handler
+	 *  @param	DoliDB		$db     	Database handler
+     *  @param	int			$type_user	Type of user
      */
-    function __construct($db)
+    function __construct($db, $type_user)
     {
+    	$this->type_user=$type_user;
         $this->db=$db;
     }
 
@@ -54,8 +52,8 @@ class MenuManager
     /**
      *  Show menu
      *
-     *	@param	string	$mode		'top' or 'left'
-     *  @return int     			Number of menu entries shown
+     *	@param	string	$mode			'top' or 'left'
+     *  @return int     				Number of menu entries shown
      */
     function showmenu($mode)
     {
@@ -63,8 +61,11 @@ class MenuManager
 
         require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php';
 
-        $conf->global->MAIN_SEARCHFORM_SOCIETE=0;
-        $conf->global->MAIN_SEARCHFORM_CONTACT=0;
+        if ($this->type_user == 1)
+        {
+        	$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);
diff --git a/htdocs/core/menus/standard/eldy_backoffice.php b/htdocs/core/menus/standard/eldy_menu.php
similarity index 63%
rename from htdocs/core/menus/standard/eldy_backoffice.php
rename to htdocs/core/menus/standard/eldy_menu.php
index 638fd45664d..2d6d11f28dc 100644
--- a/htdocs/core/menus/standard/eldy_backoffice.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2007-2010 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2007-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  *
  * 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
@@ -17,25 +17,21 @@
  */
 
 /**
- *		\file       htdocs/core/menus/standard/eldy_backoffice.php
- *		\brief      Gestionnaire nomme eldy du menu du haut
- *
- *		\remarks    La construction d'un gestionnaire pour le menu du haut est simple:
- *		\remarks    Toutes les entrees de menu a faire apparaitre dans la barre du haut
- *		\remarks    doivent etre affichees par <a class="tmenu" href="...?mainmenu=...">...</a>
- *		\remarks    ou si menu selectionne <a class="tmenusel" href="...?mainmenu=...">...</a>
+ *	\file       htdocs/core/menus/standard/eldy_menu.php
+ *	\brief      Menu eldy manager
  */
 
 
 /**
- *  Classe to manage menu Eldy 
+ *	Class to manage menu Eldy
  */
 class MenuManager
 {
 	var $db;
-	var $type_user=0;								// Put 0 for internal users, 1 for external users
+	var $type_user;									// Put 0 for internal users, 1 for external users
 	var $atarget="";                                // Valeur du target a utiliser dans les liens
-
+	var $name="eldy";
+	
     var $menu_array;
     var $menu_array_after;
 
@@ -43,10 +39,12 @@ class MenuManager
     /**
      *  Constructor
      *
-	 *  @param	DoliDB		$db     			Database handler
+	 *  @param	DoliDB		$db     	Database handler
+     *  @param	int			$type_user	Type of user
      */
-    function __construct($db)
+    function __construct($db, $type_user)
     {
+    	$this->type_user=$type_user;
         $this->db=$db;
     }
 
@@ -54,17 +52,25 @@ class MenuManager
     /**
      *  Show menu
      *
-     *	@param	string	$mode		'top' or 'left'
-     *  @return	int     			Number of menu entries shown
+     *	@param	string	$mode			'top' or 'left'
+     *  @return int     				Number of menu entries shown
      */
     function showmenu($mode)
     {
+    	global $conf;
+
         require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php';
 
+        if ($this->type_user == 1)
+        {
+        	$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);
         if ($mode == 'left') $res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after);
-
+        
         return $res;
     }
 
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 4827eafb60b..fd779495e3e 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
@@ -23,3 +23,11 @@ create table llx_adherent_type_extrafields
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
 ALTER TABLE llx_adherent_type_extrafields ADD INDEX idx_adherent_type_extrafields (fk_object);
+
+UPDATE llx_const set value='eldy_menu.php' where value='eldy_backoffice.php';
+UPDATE llx_const set value='eldy_menu.php' where value='eldy_frontoffice.php';
+UPDATE llx_const set value='auguria_menu.php' where value='auguria_backoffice.php';
+UPDATE llx_const set value='auguria_menu.php' where value='auguria_frontoffice.php';
+UPDATE llx_const set value='smartphone_menu.php' where value='smartphone_backoffice.php';
+UPDATE llx_const set value='smartphone_menu.php' where value='smartphone_frontoffice.php';
+
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index c8430c95cac..bb10a493384 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -565,6 +565,7 @@ ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP
 NoFileFound=No documents saved in this directory
 CurrentUserLanguage=Current language
 CurrentTheme=Current theme
+CurrentMenuManager=current men manager
 DisabledModules=Disabled modules
 For=For
 ForCustomer=For customer
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 80e4493ff84..52c7b339ffe 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -568,6 +568,7 @@ ThisLimitIsDefinedInSetup=Limite Dolibarr (Menu accueil-configuration-sécurité
 NoFileFound=Pas de documents stockés dans cette rubrique
 CurrentUserLanguage=Langue utilisateur actuelle
 CurrentTheme=Thème courant
+CurrentMenuManager=Gestionnaire de menu courant
 DisabledModules=Modules désactivés
 For=Pour
 ForCustomer=Pour le client
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index d464083167b..58f1ac48d02 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -778,21 +778,18 @@ if (! empty($conf->multicompany->enabled) && GETPOST('action') == 'switchentity'
 // Init menu manager
 if (empty($user->societe_id))    // If internal user or not defined
 {
-	$conf->standard_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED);
-	$conf->smart_menu=(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED);
+	$conf->standard_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?(empty($conf->global->MAIN_MENU_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENU_STANDARD):$conf->global->MAIN_MENU_STANDARD_FORCED);
+	$conf->smart_menu=(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?(empty($conf->global->MAIN_MENU_SMARTPHONE)?'smartphone_menu.php':$conf->global->MAIN_MENU_SMARTPHONE):$conf->global->MAIN_MENU_SMARTPHONE_FORCED);
 }
 else                        // If external user
 {
-	$conf->standard_menu=(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?$conf->global->MAIN_MENUFRONT_STANDARD:$conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
-	$conf->smart_menu=(empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?$conf->global->MAIN_MENUFRONT_SMARTPHONE:$conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED);
+	$conf->standard_menu=(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?(empty($conf->global->MAIN_MENUFRONT_STANDARD)?'eldy_menu.php':$conf->global->MAIN_MENUFRONT_STANDARD):$conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
+	$conf->smart_menu=(empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?(empty($conf->global->MAIN_MENUFRONT_SMARTPHONE)?'smartphone_menu.php':$conf->global->MAIN_MENUFRONT_SMARTPHONE):$conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED);
 }
-// For backward compatibility
-if (empty($conf->standard_menu))  $conf->standard_menu ='eldy_backoffice.php';
-elseif ($conf->standard_menu == 'eldy.php') $conf->standard_menu='eldy_backoffice.php';
 
 // Load the menu manager (only if not already done)
 $file_menu=empty($conf->browser->phone)?$conf->standard_menu:$conf->smart_menu;
-if (GETPOST('menu')) $file_menu=GETPOST('menu');     // menu=eldy_backoffice.php
+if (GETPOST('menu')) $file_menu=GETPOST('menu');     // example: menu=eldy_menu.php
 if (! class_exists('MenuManager'))
 {
 	$menufound=0;
@@ -804,11 +801,12 @@ if (! class_exists('MenuManager'))
 	}
 	if (! $menufound)	// If failed to include, we try with standard
 	{
-		$file_menu='eldy_backoffice.php';
+		dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
+		$file_menu='eldy_menu.php';
 		include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$file_menu;
 	}
 }
-$menumanager = new MenuManager($db);
+$menumanager = new MenuManager($db, empty($user->societe_id)?0:1);
 
 
 
@@ -1337,6 +1335,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	    $loginhtmltext.='<br><b>'.$langs->trans("PreviousConnexion").'</b>: '.dol_print_date($user->datepreviouslogin,"dayhour");
 	    $loginhtmltext.='<br><b>'.$langs->trans("AuthenticationMode").'</b>: '.$_SESSION["dol_authmode"];
 	    $loginhtmltext.='<br><b>'.$langs->trans("CurrentTheme").'</b>: '.$conf->theme;
+	    $loginhtmltext.='<br><b>'.$langs->trans("CurrentMenuManager").'</b>: '.$menumanager->name;
 	    $s=picto_from_langcode($langs->getDefaultLang());
 	    $loginhtmltext.='<br><b>'.$langs->trans("CurrentUserLanguage").'</b>: '.($s?$s.' ':'').$langs->getDefaultLang();
 	    $loginhtmltext.='<br><b>'.$langs->trans("Browser").'</b>: '.$conf->browser->name.($conf->browser->version?' '.$conf->browser->version:'').' ('.$_SERVER['HTTP_USER_AGENT'].')';

From 56e11e52faeb70c42c2ff42aae0ef00a7416abda Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 25 Jan 2013 19:12:54 +0100
Subject: [PATCH 032/162] New: hookmanager class is used frequently and is a
 factory object, so we can move it during init of environment and use it
 globally.

---
 htdocs/adherents/class/adherent.class.php     |  4 +--
 .../adherents/class/adherent_type.class.php   |  4 +--
 htdocs/adherents/fiche.php                    |  2 --
 htdocs/adherents/type.php                     |  2 --
 htdocs/admin/dict.php                         |  2 --
 htdocs/categories/categorie.php               |  2 --
 htdocs/comm/action/class/actioncomm.class.php | 10 +++----
 htdocs/comm/action/fiche.php                  |  2 --
 htdocs/comm/addpropal.php                     |  2 --
 htdocs/comm/list.php                          |  2 --
 htdocs/comm/mailing/fiche.php                 |  2 --
 htdocs/comm/propal.php                        |  2 --
 htdocs/comm/propal/list.php                   |  2 --
 htdocs/comm/prospect/list.php                 |  2 --
 htdocs/commande/class/commande.class.php      |  8 +-----
 htdocs/commande/fiche.php                     |  2 --
 htdocs/compta/deplacement/fiche.php           |  2 --
 htdocs/compta/dons/fiche.php                  |  2 --
 htdocs/compta/facture.php                     |  2 --
 htdocs/compta/facture/class/facture.class.php |  4 +--
 htdocs/compta/facture/list.php                |  2 --
 htdocs/compta/tva/fiche.php                   |  2 --
 htdocs/contact/class/contact.class.php        |  4 +--
 htdocs/contact/fiche.php                      |  2 --
 htdocs/contrat/fiche.php                      |  2 --
 htdocs/core/class/commonobject.class.php      |  8 ++----
 htdocs/core/class/html.formfile.class.php     | 12 ++-------
 htdocs/core/class/html.formmail.class.php     | 11 +-------
 htdocs/core/lib/files.lib.php                 | 27 ++-----------------
 htdocs/core/lib/security2.lib.php             |  5 ----
 htdocs/expedition/fiche.php                   |  2 --
 htdocs/fichinter/fiche.php                    |  2 --
 htdocs/fourn/commande/fiche.php               |  2 --
 htdocs/fourn/facture/fiche.php                |  2 --
 htdocs/fourn/liste.php                        |  2 --
 htdocs/index.php                              |  2 --
 htdocs/main.inc.php                           | 14 +---------
 htdocs/master.inc.php                         | 10 ++++---
 htdocs/product/class/product.class.php        |  4 +--
 htdocs/product/fiche.php                      |  2 --
 htdocs/product/fournisseurs.php               |  2 --
 htdocs/projet/fiche.php                       |  2 --
 htdocs/projet/tasks.php                       |  2 --
 htdocs/projet/tasks/task.php                  |  2 --
 htdocs/public/demo/index.php                  |  2 --
 htdocs/societe/agenda.php                     |  2 --
 htdocs/societe/class/societe.class.php        |  6 +----
 htdocs/societe/info.php                       |  2 --
 htdocs/societe/soc.php                        |  2 --
 htdocs/user/class/user.class.php              |  4 +--
 htdocs/user/fiche.php                         |  2 --
 htdocs/user/passwordforgotten.php             |  5 ----
 52 files changed, 27 insertions(+), 183 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 61edd3bee05..0eea1c6f5d7 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -394,7 +394,7 @@ class Adherent extends CommonObject
      */
     function update($user,$notrigger=0,$nosyncuser=0,$nosyncuserpass=0,$nosyncthirdparty=0,$action='update')
     {
-        global $conf, $langs;
+        global $conf, $langs, $hookmanager;
 
         $nbrowsaffected=0;
         $error=0;
@@ -462,8 +462,6 @@ class Adherent extends CommonObject
 		    $nbrowsaffected+=$this->db->affected_rows($resql);
 
             // Actions on extra fields (by external module)
-            include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-            $hookmanager=new HookManager($this->db);
             $hookmanager->initHooks(array('memberdao'));
             $parameters=array('id'=>$this->id);
             $action='';
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index ead494783aa..d829c5a84f9 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -98,6 +98,8 @@ class AdherentType extends CommonObject
      */
     function update($user)
     {
+    	global $hookmanager;
+    	
         $this->libelle=trim($this->libelle);
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."adherent_type ";
@@ -114,8 +116,6 @@ class AdherentType extends CommonObject
         if ($result)
         {
         	// Actions on extra fields (by external module or standard code)
-        	include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-        	$hookmanager=new HookManager($this->db);
         	$hookmanager->initHooks(array('membertypedao'));
         	$parameters=array('membertype'=>$this->id);
         	$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 02e0af3a768..f84990b94e5 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -107,8 +107,6 @@ if ($rowid)
 }
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('membercard'));
 
 
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 592695130b3..369f925bc7e 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -67,8 +67,6 @@ if (GETPOST('button_removefilter'))
 
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('membertypecard'));
 
 /*
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 56f4f6140bb..b5c49355672 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -64,8 +64,6 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('admin'));
 
 // This page is a generic page to edit dictionnaries
diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index fb4ba30a269..d3a06304e46 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -86,8 +86,6 @@ if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user,$objecttype,$objectid,$dbtablename,'','',$fieldid);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('categorycard'));
 
 
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 5e7a77c6ca2..43278dbaaa2 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -106,8 +106,8 @@ class ActionComm extends CommonObject
      */
     function add($user,$notrigger=0)
     {
-        global $langs,$conf;
-
+        global $langs,$conf,$hookmanager;
+        
         $error=0;
         $now=dol_now();
 
@@ -210,8 +210,6 @@ class ActionComm extends CommonObject
             $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."actioncomm","id");
 
             // Actions on extra fields (by external module or standard code)
-            include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-            $hookmanager=new HookManager($this->db);
             $hookmanager->initHooks(array('actioncommdao'));
             $parameters=array('actcomm'=>$this->id);
             $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
@@ -430,7 +428,7 @@ class ActionComm extends CommonObject
      */
     function update($user,$notrigger=0)
     {
-        global $langs,$conf;
+        global $langs,$conf,$hookmanager;
 
         $error=0;
 
@@ -482,8 +480,6 @@ class ActionComm extends CommonObject
         {
 
         	// Actions on extra fields (by external module or standard code)
-        	include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-        	$hookmanager=new HookManager($this->db);
         	$hookmanager->initHooks(array('actioncommdao'));
         	$parameters=array('actcomm'=>$this->id);
         	$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index 60233a20650..782d7444429 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -66,8 +66,6 @@ $extrafields = new ExtraFields($db);
 //var_dump($_POST);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('actioncard'));
 
 
diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php
index b2d5285d849..8c5a07df0c3 100644
--- a/htdocs/comm/addpropal.php
+++ b/htdocs/comm/addpropal.php
@@ -46,8 +46,6 @@ $origin=GETPOST('origin','alpha');
 $originid=GETPOST('originid','int');
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('propalcard'));
 
 /*
diff --git a/htdocs/comm/list.php b/htdocs/comm/list.php
index 496b9217059..fd7ea79f345 100755
--- a/htdocs/comm/list.php
+++ b/htdocs/comm/list.php
@@ -58,8 +58,6 @@ $search_categ = GETPOST("search_categ",'int');
 $catid        = GETPOST("catid",'int');
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('customerlist'));
 
 
diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php
index 680790ff04e..310a48eb935 100644
--- a/htdocs/comm/mailing/fiche.php
+++ b/htdocs/comm/mailing/fiche.php
@@ -47,8 +47,6 @@ $result=$object->fetch($id);
 $extrafields = new ExtraFields($db);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('mailingcard'));
 
 // Tableau des substitutions possibles
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index f1850014a48..08a03ff8866 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -99,8 +99,6 @@ else
 }
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('propalcard'));
 
 
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 95e549c0b1d..b2f1f8dcc44 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -77,8 +77,6 @@ $result = restrictedArea($user, $module, $objectid, $dbtable);
 
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('propalcard'));
 
 
diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php
index a093f73c57b..69aaab9e68e 100755
--- a/htdocs/comm/prospect/list.php
+++ b/htdocs/comm/prospect/list.php
@@ -148,8 +148,6 @@ $sts = array(-1,0,1,2,3);
 
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('prospectlist'));
 
 
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 481b51400a5..28d56fcf3a2 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -880,8 +880,7 @@ class Commande extends CommonOrder
      */
     function createFromProposal($object)
     {
-        global $conf,$user,$langs;
-        global $hookmanager;
+        global $conf,$user,$langs,$hookmanager;
 
         $error=0;
 
@@ -945,11 +944,6 @@ class Commande extends CommonOrder
             if ($ret > 0)
             {
                 // Actions hooked (by external module)
-                if (! is_object($hookmanager))
-                {
-                	include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-                	$hookmanager=new HookManager($this->db);
-                }
                 $hookmanager->initHooks(array('orderdao'));
 
                 $parameters=array('objFrom'=>$object);
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index e3fd1029326..b6e7b821495 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -84,8 +84,6 @@ if ($id > 0 || ! empty($ref))
 }
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('ordercard'));
 
 
diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php
index d13880f7559..1e20d91c350 100644
--- a/htdocs/compta/deplacement/fiche.php
+++ b/htdocs/compta/deplacement/fiche.php
@@ -49,8 +49,6 @@ $mesg = '';
 $object = new Deplacement($db);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('tripsandexpensescard'));
 
 
diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php
index 51550f41ebd..6ba13a19631 100644
--- a/htdocs/compta/dons/fiche.php
+++ b/htdocs/compta/dons/fiche.php
@@ -50,8 +50,6 @@ $donation_date=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOS
 $result = restrictedArea($user, 'don', $id);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('doncard'));
 
 
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 34b501f73c9..f15762b97bf 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -95,8 +95,6 @@ if ($id > 0 || ! empty($ref))
 }
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('invoicecard'));
 
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index cf7b89be7aa..1637524cfce 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -637,7 +637,7 @@ class Facture extends CommonInvoice
      */
     function createFromOrder($object)
     {
-        global $conf,$user,$langs;
+        global $conf,$user,$langs,$hookmanager;
 
         $error=0;
 
@@ -701,8 +701,6 @@ class Facture extends CommonInvoice
         if ($ret > 0)
         {
             // Actions hooked (by external module)
-            include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-            $hookmanager=new HookManager($this->db);
             $hookmanager->initHooks(array('invoicedao'));
 
             $parameters=array('objFrom'=>$object);
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 12d653e5b26..796bf769698 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -97,8 +97,6 @@ $usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MA
 $object=new Facture($db);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('invoicecard'));
 
 $now=dol_now();
diff --git a/htdocs/compta/tva/fiche.php b/htdocs/compta/tva/fiche.php
index 45dc91263ad..c8139c5575f 100644
--- a/htdocs/compta/tva/fiche.php
+++ b/htdocs/compta/tva/fiche.php
@@ -41,8 +41,6 @@ if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('taxvatcard'));
 
 
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index c1eb6426c7b..14c8630e1e5 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -210,7 +210,7 @@ class Contact extends CommonObject
 	 */
 	function update($id, $user=0, $notrigger=0, $action='update')
 	{
-		global $conf, $langs;
+		global $conf, $langs, $hookmanager;
 
 		$error=0;
 
@@ -266,8 +266,6 @@ class Contact extends CommonObject
 		    unset($this->state);
 
 		    // Actions on extra fields (by external module or standard code)
-		    include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-		    $hookmanager=new HookManager($this->db);
 		    $hookmanager->initHooks(array('contactdao'));
 		    $parameters=array('socid'=>$this->id);
 		    $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 0233c367b07..9097584bfb5 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -65,8 +65,6 @@ if (! empty($canvas))
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', '', $objcanvas); // If we create a contact with no company (shared contacts), no check on write permission
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('contactcard'));
 
 
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 50c30e4be2b..d3a7f48c24b 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -59,8 +59,6 @@ $result=restrictedArea($user,'contrat',$id);
 $usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:0);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('contractcard'));
 
 $object = new Contrat($db);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 8b6002c29c5..344507971bb 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2468,16 +2468,12 @@ abstract class CommonObject
      */
     function showLinkedObjectBlock($hookmanager=false)
     {
-        global $conf,$langs,$bc;
+        global $conf,$langs,$hookmanager;
+        global $bc;
 
         $this->fetchObjectLinked();
 
         // Bypass the default method
-        if (! is_object($hookmanager))
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-        	$hookmanager=new HookManager($this->db);
-        }
         $hookmanager->initHooks(array('commonobject'));
         $parameters=array();
         $reshook=$hookmanager->executeHooks('showLinkedObjectBlock',$parameters,$this,$action);    // Note that $action and $object may have been modified by hook
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 8e43669b2e8..83818285265 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -590,18 +590,10 @@ class FormFile
      */
 	function list_of_documents($filearray,$object,$modulepart,$param='',$forcedownload=0,$relativepath='',$permtodelete=1,$useinecm=0,$textifempty='',$maxlength=0,$title='',$url='')
 	{
-		global $user, $conf, $langs;
-		global $bc, $hookmanager;
+		global $user, $conf, $langs, $hookmanager;
+		global $bc;
 		global $sortfield, $sortorder, $maxheightmini;
 
-		if (! is_object($hookmanager))
-		{
-			if (! class_exists('HookManager')) {
-				// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-				require DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-				$hookmanager=new HookManager($this->db);
-			}
-		}
 		$hookmanager->initHooks(array('formfile'));
 
 		$parameters=array(
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index c221cc33c07..f499bcb6b68 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -216,20 +216,11 @@ class FormMail
      */
     function get_form($addfileaction='addfile',$removefileaction='removefile')
     {
-        global $conf, $langs, $user;
-        global $hookmanager;
+        global $conf, $langs, $user, $hookmanager;
 
         $langs->load("other");
         $langs->load("mails");
 
-        if (! is_object($hookmanager))
-        {
-        	if (! class_exists('HookManager')) {
-        		// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-        		require DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-        		$hookmanager=new HookManager($this->db);
-        	}
-        }
         $hookmanager->initHooks(array('formmail'));
 
         $parameters=array(
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index c257b00e56d..b480184808f 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -65,15 +65,8 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil
 	$path=preg_replace('/([\\/]+)$/i','',$path);
 	$newpath=dol_osencode($path);
 
-	if (! $nohook) {
-		if (! is_object($hookmanager))
-		{
-			if (! class_exists('HookManager')) {
-				// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-				require DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-				$hookmanager=new HookManager($db);
-			}
-		}
+	if (! $nohook) 
+	{
 		$hookmanager->initHooks(array('fileslib'));
 
 		$parameters=array(
@@ -653,14 +646,6 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 			return -2;
 		}
 
-		if (! is_object($hookmanager))
-		{
-			if (! class_exists('HookManager')) {
-				// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-				require DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			}
-			$hookmanager=new HookManager($db);
-		}
 		$hookmanager->initHooks(array('fileslib'));
 
 		$parameters=array('filename' => $file_name, 'varfiles' => $varfiles, 'allowoverwrite' => $allowoverwrite);
@@ -722,14 +707,6 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
 
 	if (empty($nohook))
 	{
-		if (! is_object($hookmanager))
-		{
-			if (! class_exists('HookManager')) {
-				// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-				require DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-				$hookmanager=new HookManager($db);
-			}
-		}
 		$hookmanager->initHooks(array('fileslib'));
 
 		$parameters=array(
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index b7196ba228f..6aa41576c01 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -131,11 +131,6 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	global $smartphone,$hookmanager;
 
 	// Instantiate hooks of thirdparty module only if not already define
-	if (! is_object($hookmanager))
-	{
-		include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-		$hookmanager=new HookManager($db);
-	}
 	$hookmanager->initHooks(array('mainloginpage'));
 
 	$langcode=(GETPOST('lang')?((is_object($langs)&&$langs->defaultlang)?$langs->defaultlang:'auto'):GETPOST('lang'));
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 7e9a24be0f9..1d34aea5d0c 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -59,8 +59,6 @@ if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user, $origin, $origin_id);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('expeditioncard'));
 
 $action		= GETPOST('action','alpha');
diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index 755b68b5af1..86230754ef3 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -60,8 +60,6 @@ if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('interventioncard'));
 
 $object = new Fichinter($db);
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index bbe46c9a21a..ed5c7483c64 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -70,8 +70,6 @@ if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'commande_fournisseur', $id,'');
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('ordersuppliercard'));
 
 $object = new CommandeFournisseur($db);
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 241c17b7cef..abec49e0e89 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -61,8 +61,6 @@ if (! empty($user->societe_id)) $socid=$user->societe_id;
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('invoicesuppliercard'));
 
 $object=new FactureFournisseur($db);
diff --git a/htdocs/fourn/liste.php b/htdocs/fourn/liste.php
index 3c50b16cb4f..13361f10eb2 100644
--- a/htdocs/fourn/liste.php
+++ b/htdocs/fourn/liste.php
@@ -57,8 +57,6 @@ if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="nom";
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('supplierlist'));
 
 /*
diff --git a/htdocs/index.php b/htdocs/index.php
index ba3cbf1b05f..8119e3a83be 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -34,8 +34,6 @@ $_GET['mainmenu']=GETPOST('mainmenu', 'alpha')?GETPOST('mainmenu', 'alpha'):'hom
 $action=GETPOST('action');
 
 
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('index'));
 
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 58f1ac48d02..ec82c9e7e41 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -603,8 +603,6 @@ if (! defined('NOLOGIN'))
 
         // Hooks on successfull login
         $action='';
-        include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-        $hookmanager=new HookManager($db);
         $hookmanager->initHooks(array('login'));
         $parameters=array('dol_authmode'=>$dol_authmode);
         $reshook=$hookmanager->executeHooks('afterLogin',$parameters,$user,$action);    // Note that $action and $object may have been modified by some hooks
@@ -1194,12 +1192,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
     global $dolibarr_main_authentication;
     global $hookmanager,$menumanager;
 
-    // Instantiate hooks of thirdparty module only if not already define
-    if (! is_object($hookmanager))
-    {
-    	include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-    	$hookmanager=new HookManager($db);
-    }
+    // Instantiate hooks of thirdparty module
     $hookmanager->initHooks(array('toprightmenu'));
 
     $toprightmenu='';
@@ -1426,11 +1419,6 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
     $bookmarks='';
 
     // Instantiate hooks of thirdparty module
-    if (! is_object($hookmanager))
-    {
-    	include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-    	$hookmanager=new HookManager($db);
-	}
     $hookmanager->initHooks(array('searchform','leftblock'));
 
     if (empty($_SESSION['dol_hide_leftmenu']))
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 6d6ce8680b8..b023f7110b0 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -186,9 +186,7 @@ if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
 	}
 }
 
-/*
- * Create object $mysoc (A thirdparty object that contains properties of companies managed by Dolibarr.
- */
+// Create object $mysoc (A thirdparty object that contains properties of companies managed by Dolibarr.
 if (! defined('NOREQUIREDB') && ! defined('NOREQUIRESOC'))
 {
 	require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
@@ -207,6 +205,12 @@ if (! defined('NOREQUIRETRAN'))
 	$langs->setDefaultLang((! empty($conf->global->MAIN_LANG_DEFAULT)?$conf->global->MAIN_LANG_DEFAULT:''));
 }
 
+
+// Create the global $hookmanager object
+include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+$hookmanager=new HookManager($db);
+
+
 if (! defined('MAIN_LABEL_MENTION_NPR') ) define('MAIN_LABEL_MENTION_NPR','NPR');
 
 // We force feature to help debug
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index a9c0439b220..8f91e30b257 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -418,7 +418,7 @@ class Product extends CommonObject
 	 */
 	function update($id, $user, $notrigger=false, $action='update')
 	{
-		global $langs, $conf;
+		global $langs, $conf, $hookmanager;
 
 		$error=0;
 
@@ -500,8 +500,6 @@ class Product extends CommonObject
 			}
 
 			// Actions on extra fields (by external module or standard code)
-			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
 			$hookmanager->initHooks(array('productdao'));
 			$parameters=array('id'=>$this->id);
 			$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index 74aa705eeab..1ccc7e2c8b3 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -78,8 +78,6 @@ $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype,$objcanvas);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('productcard'));
 
 
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index b8b30184af9..43929c96b0c 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -59,8 +59,6 @@ if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit|service&fournisseur',$fieldvalue,'product&product','','',$fieldtype);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('pricesuppliercard'));
 
 
diff --git a/htdocs/projet/fiche.php b/htdocs/projet/fiche.php
index f5870301860..fc518e29d27 100644
--- a/htdocs/projet/fiche.php
+++ b/htdocs/projet/fiche.php
@@ -50,8 +50,6 @@ if ($user->societe_id > 0) $socid=$user->societe_id;
 $result = restrictedArea($user, 'projet', $id);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('projectcard'));
 
 $object = new Project($db);
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 934bf9b238e..55055d0f467 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -55,8 +55,6 @@ if ($user->societe_id > 0) $socid = $user->societe_id;
 $result = restrictedArea($user, 'projet', $id);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('projecttaskcard'));
 
 $progress=GETPOST('progress', 'int');
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index def739e31f1..94034e9b541 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -42,8 +42,6 @@ if ($user->societe_id > 0) $socid = $user->societe_id;
 if (! $user->rights->projet->lire) accessforbidden();
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('projecttaskcard'));
 
 $object = new Task($db);
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index b8a240b44b6..40c499d5469 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -38,8 +38,6 @@ global $dolibarr_main_demo;
 if (empty($dolibarr_main_demo)) accessforbidden('Parameter dolibarr_main_demo must be defined in conf file with value "default login,default pass" to enable the demo entry page',1,1,1);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('demo'));
 
 $demoprofiles=array(
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 9e373a97158..bc9b11b3149 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -38,8 +38,6 @@ if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('agendathirdparty'));
 
 
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 6ea29526c00..95c16965fb5 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -380,7 +380,7 @@ class Societe extends CommonObject
      */
     function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0, $action='update', $nosyncmember=1)
     {
-        global $langs,$conf;
+        global $langs,$conf,$hookmanager;
         require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		$error=0;
@@ -612,8 +612,6 @@ class Societe extends CommonObject
                 $this->AddFournisseurInCategory($this->fournisseur_categorie);
 
                 // Actions on extra fields (by external module or standard code)
-                include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-                $hookmanager=new HookManager($this->db);
                 $hookmanager->initHooks(array('thirdpartydao'));
                 $parameters=array('socid'=>$this->id);
                 $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
@@ -1064,8 +1062,6 @@ class Societe extends CommonObject
             if (! $error)
             {
             	// Additionnal action by hooks
-                include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-                $hookmanager=new HookManager($this->db);
                 $hookmanager->initHooks(array('thirdpartydao'));
                 $parameters=array(); $action='delete';
                 $reshook=$hookmanager->executeHooks('deleteThirdparty',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
diff --git a/htdocs/societe/info.php b/htdocs/societe/info.php
index 82eab7da454..8f0d0836ed4 100644
--- a/htdocs/societe/info.php
+++ b/htdocs/societe/info.php
@@ -38,8 +38,6 @@ if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('infothirdparty'));
 
 
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index d2f816cd1ca..9a9900df23e 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -70,8 +70,6 @@ if (! empty($canvas))
 $result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', $objcanvas);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('thirdpartycard'));
 
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index daf7b7ade4c..678be6bf873 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1079,7 +1079,7 @@ class User extends CommonObject
 	 */
 	function update($user,$notrigger=0,$nosyncmember=0,$nosyncmemberpass=0)
 	{
-		global $conf, $langs;
+		global $conf, $langs, $hookmanager;
 
 		$nbrowsaffected=0;
 		$error=0;
@@ -1218,8 +1218,6 @@ class User extends CommonObject
 			}
 
 			// Actions on extra fields (by external module or standard code)
-			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-			$hookmanager=new HookManager($this->db);
 			$hookmanager->initHooks(array('userdao'));
 			$parameters=array('socid'=>$this->id);
 			$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 7ce2640710a..4d79b687c60 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -84,8 +84,6 @@ $object = new User($db);
 $extrafields = new ExtraFields($db);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
 $hookmanager->initHooks(array('usercard'));
 
 
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index a3bbcea980a..61ac2f373fc 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -52,11 +52,6 @@ $passwordmd5	= GETPOST('passwordmd5');
 $conf->entity 	= (GETPOST('entity') ? GETPOST('entity') : 1);
 
 // Instantiate hooks of thirdparty module only if not already define
-if (! is_object($hookmanager))
-{
-	include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-	$hookmanager=new HookManager($db);
-}
 $hookmanager->initHooks(array('passwordforgottenpage'));
 
 

From 64cac3194ccbc2d594e2fc4e7be479eb1e6d6589 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 25 Jan 2013 19:19:41 +0100
Subject: [PATCH 033/162] Fix: Use translation of NPR

---
 htdocs/admin/dict.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index b5c49355672..d5fe7846714 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -732,7 +732,7 @@ if ($id)
                 if (in_array('region_id',$fieldlist)) { print '<td>&nbsp;</td>'; continue; }		// For region page, we do not show the country input
                 $valuetoshow=$langs->trans("Country");
             }
-            if ($fieldlist[$field]=='recuperableonly') { $valuetoshow=MAIN_LABEL_MENTION_NPR; $align="center"; }
+            if ($fieldlist[$field]=='recuperableonly') { $valuetoshow=$langs->trans("NPR"); $align="center"; }
             if ($fieldlist[$field]=='nbjour')          { $valuetoshow=$langs->trans("NbOfDays"); }
             if ($fieldlist[$field]=='fdm')             { $valuetoshow=$langs->trans("AtEndOfMonth"); }
             if ($fieldlist[$field]=='decalage')        { $valuetoshow=$langs->trans("Offset"); }
@@ -846,7 +846,7 @@ if ($id)
                 if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label') { $valuetoshow=$langs->trans("Label")."*"; }
                 if ($fieldlist[$field]=='libelle_facture') { $valuetoshow=$langs->trans("LabelOnDocuments")."*"; }
                 if ($fieldlist[$field]=='pays')            { $valuetoshow=$langs->trans("Country"); }
-                if ($fieldlist[$field]=='recuperableonly') { $valuetoshow=MAIN_LABEL_MENTION_NPR; $align="center"; }
+                if ($fieldlist[$field]=='recuperableonly') { $valuetoshow=$langs->trans("NPR"); $align="center"; }
                 if ($fieldlist[$field]=='nbjour')          { $valuetoshow=$langs->trans("NbOfDays"); }
                 if ($fieldlist[$field]=='fdm')             { $valuetoshow=$langs->trans("AtEndOfMonth"); }
                 if ($fieldlist[$field]=='decalage')        { $valuetoshow=$langs->trans("Offset"); }

From fcee35c65dd590a05763e5d6185ce1735589a8a0 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Sat, 26 Jan 2013 10:35:30 +0100
Subject: [PATCH 034/162] Fix: $hookmanager is a global object

---
 htdocs/comm/propal.php                        | 32 +++----
 htdocs/comm/propal/class/propal.class.php     |  5 +-
 htdocs/commande/class/commande.class.php      |  5 +-
 htdocs/commande/fiche.php                     | 38 ++++----
 htdocs/compta/facture.php                     | 32 +++----
 htdocs/compta/facture/class/facture.class.php |  2 +-
 htdocs/compta/paiement/fiche.php              |  2 +-
 htdocs/compta/payment_sc/fiche.php            |  2 +-
 htdocs/contrat/fiche.php                      | 18 ++--
 htdocs/core/class/commonobject.class.php      | 33 +++----
 htdocs/core/class/html.formfile.class.php     | 11 +--
 htdocs/core/lib/pdf.lib.php                   | 92 +++++++++++--------
 .../doc/doc_generic_order_odt.modules.php     |  5 +-
 .../commande/doc/pdf_einstein.modules.php     | 34 ++++---
 .../modules/commande/modules_commande.php     |  7 +-
 htdocs/core/modules/dons/modules_don.php      |  2 +-
 .../doc/pdf_expedition_merou.modules.php      |  7 +-
 .../doc/pdf_expedition_rouget.modules.php     |  7 +-
 .../doc/doc_generic_invoice_odt.modules.php   |  5 +-
 .../modules/facture/doc/pdf_crabe.modules.php | 32 +++----
 .../core/modules/facture/modules_facture.php  |  5 +-
 .../fichinter/doc/pdf_soleil.modules.php      |  5 +-
 .../modules/fichinter/modules_fichinter.php   |  5 +-
 .../core/modules/project/modules_project.php  |  7 +-
 .../doc/doc_generic_proposal_odt.modules.php  | 10 +-
 .../modules/propale/doc/pdf_azur.modules.php  | 37 +++-----
 .../core/modules/propale/modules_propale.php  |  5 +-
 .../societe/doc/doc_generic_odt.modules.php   | 10 +-
 .../modules_facturefournisseur.php            |  5 +-
 .../pdf/pdf_canelle.modules.php               | 21 ++---
 .../modules_commandefournisseur.php           |  5 +-
 .../pdf/pdf_muscadet.modules.php              | 21 ++---
 htdocs/expedition/fiche.php                   |  2 +-
 htdocs/fichinter/fiche.php                    |  2 +-
 .../class/fournisseur.commande.class.php      |  5 +-
 htdocs/fourn/commande/fiche.php               | 18 ++--
 htdocs/fourn/facture/fiche.php                | 10 +-
 htdocs/societe/class/societe.class.php        | 15 +--
 htdocs/societe/soc.php                        | 30 +++---
 39 files changed, 272 insertions(+), 317 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 08a03ff8866..31c9e36d898 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -121,7 +121,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes')
 	{
 		if ($object->id > 0)
 		{
-			$result=$object->createFromClone($socid, $hookmanager);
+			$result=$object->createFromClone($socid);
 			if ($result > 0)
 			{
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
@@ -170,7 +170,7 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->
 			$outputlangs->setDefaultLang($newlang);
 		}
 		$ret=$object->fetch($id);    // Reload to get new records
-		propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+		propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
 	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
@@ -194,7 +194,7 @@ else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->pr
 				$outputlangs->setDefaultLang($newlang);
 			}
 			$ret=$object->fetch($id);    // Reload to get new records
-			propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+			propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
 	}
 	else
@@ -371,7 +371,7 @@ else if ($action == 'add' && $user->rights->propal->creer)
     					$outputlangs->setDefaultLang($newlang);
     				}
     				$ret=$object->fetch($id);    // Reload to get new records
-    				propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+    				propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
     			}
 
     			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
@@ -607,7 +607,7 @@ if ($action == 'modif' && $user->rights->propal->creer)
 			$outputlangs->setDefaultLang($newlang);
 		}
 		$ret=$object->fetch($id);    // Reload to get new records
-		propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+		propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 }
 
@@ -814,7 +814,7 @@ else if ($action == "addline" && $user->rights->propal->creer)
 						$outputlangs->setDefaultLang($newlang);
 					}
 					$ret=$object->fetch($id);    // Reload to get new records
-					propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+					propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
 
 				unset($_POST['qty']);
@@ -935,7 +935,7 @@ else if ($action == 'updateligne' && $user->rights->propal->creer && GETPOST('sa
 					$outputlangs->setDefaultLang($newlang);
 				}
 				$ret=$object->fetch($id);    // Reload to get new records
-				propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+				propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 
 			unset($_POST['qty']);
@@ -981,7 +981,7 @@ else if ($action == 'builddoc' && $user->rights->propal->creer)
 		$outputlangs->setDefaultLang($newlang);
 	}
 	$ret=$object->fetch($id);    // Reload to get new records
-	$result=propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+	$result=propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
 	if ($result <= 0)
 	{
@@ -1070,7 +1070,7 @@ else if ($action == 'up' && $user->rights->propal->creer)
 			$outputlangs->setDefaultLang($newlang);
 		}
 		$ret=$object->fetch($id);    // Reload to get new records
-		propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+		propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
 	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.'#'.GETPOST('rowid'));
@@ -1092,7 +1092,7 @@ else if ($action == 'down' && $user->rights->propal->creer)
 			$outputlangs->setDefaultLang($newlang);
 		}
 		$ret=$object->fetch($id);    // Reload to get new records
-		propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+		propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
 	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.'#'.GETPOST('rowid'));
@@ -1626,7 +1626,7 @@ print '<table id="tablelines" class="noborder" width="100%">';
 // Show object lines
 $result = $object->getLinesArray();
 if (! empty($object->lines))
-	$ret=$object->printObjectLines($action,$mysoc,$soc,$lineid,0,$hookmanager);
+	$ret=$object->printObjectLines($action,$mysoc,$soc,$lineid);
 
 // Form to add new line
 if ($object->statut == 0 && $user->rights->propal->creer)
@@ -1638,18 +1638,18 @@ if ($object->statut == 0 && $user->rights->propal->creer)
 		if ($conf->global->MAIN_FEATURES_LEVEL > 1)
 		{
 			// Add free or predefined products/services
-			$object->formAddObjectLine(0,$mysoc,$soc,$hookmanager);
+			$object->formAddObjectLine(0,$mysoc,$soc);
 		}
 		else
 		{
 			// Add free products/services
-			$object->formAddFreeProduct(0,$mysoc,$soc,$hookmanager);
+			$object->formAddFreeProduct(0,$mysoc,$soc);
 
 			// Add predefined products/services
 			if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
 			{
 				$var=!$var;
-				$object->formAddPredefinedProduct(0,$mysoc,$soc,$hookmanager);
+				$object->formAddPredefinedProduct(0,$mysoc,$soc);
 			}
 		}
 
@@ -1799,7 +1799,7 @@ if ($action != 'presend')
 
 	$var=true;
 
-	$somethingshown=$formfile->show_documents('propal',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'',0,'',$soc->default_lang,$hookmanager);
+	$somethingshown=$formfile->show_documents('propal',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'',0,'',$soc->default_lang);
 
 
 	/*
@@ -1843,7 +1843,7 @@ if ($action == 'presend')
             $outputlangs->setDefaultLang($newlang);
         }
 
-        $result=propale_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+        $result=propale_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
         if ($result <= 0)
         {
             dol_print_error($db,$result);
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 8e3e4748f05..90ba3f93690 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -867,12 +867,11 @@ class Propal extends CommonObject
      *		Load an object from its id and create a new one in database
      *
      *		@param		int				$socid			Id of thirdparty
-     *		@param		HookManager		$hookmanager	Hook manager instance
      * 	 	@return		int								New id of clone
      */
-    function createFromClone($socid=0,$hookmanager=false)
+    function createFromClone($socid=0)
     {
-        global $user,$langs,$conf;
+        global $user,$langs,$conf,$hookmanager;
 
         $error=0;
         $now=dol_now();
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 28d56fcf3a2..335757c59d6 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -794,12 +794,11 @@ class Commande extends CommonOrder
      *	Load an object from its id and create a new one in database
      *
      *	@param		int			$socid			Id of thirdparty
-     *	@param		HookManager	$hookmanager	Hook manager instance
      *	@return		int							New id of clone
      */
-    function createFromClone($socid=0,$hookmanager=false)
+    function createFromClone($socid=0)
     {
-        global $conf,$user,$langs;
+        global $conf,$user,$langs,$hookmanager;
 
         $error=0;
 
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index b6e7b821495..ccaadefe2ee 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -105,7 +105,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->commande->
 	{
 		if ($object->id > 0)
 		{
-			$result=$object->createFromClone($socid, $hookmanager);
+			$result=$object->createFromClone($socid);
 			if ($result > 0)
 			{
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
@@ -172,7 +172,7 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->
 		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 		{
 			$ret=$object->fetch($object->id);    // Reload to get new records
-			commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+			commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
 
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
@@ -202,7 +202,7 @@ else if ($action == 'add' && $user->rights->commande->creer)
 		$action='create';
 		$error++;
 	}
-	
+
 	if ($socid<1)
 	{
 		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Customer")),'errors');
@@ -504,7 +504,7 @@ else if ($action == 'setconditions' && $user->rights->commande->creer)
 			}
 
 			$ret=$object->fetch($object->id);    // Reload to get new records
-			commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+			commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
 	}
 }
@@ -743,7 +743,7 @@ else if ($action == 'addline' && $user->rights->commande->creer)
 					}
 
 					$ret=$object->fetch($object->id);    // Reload to get new records
-					commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+					commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
 
 				unset($_POST['qty']);
@@ -870,7 +870,7 @@ else if ($action == 'updateligne' && $user->rights->commande->creer && GETPOST('
 				}
 
 				$ret=$object->fetch($object->id);    // Reload to get new records
-				commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+				commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 
 			unset($_POST['qty']);
@@ -929,7 +929,7 @@ else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->co
 				$outputlangs = new Translate("",$conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
 	}
 }
@@ -968,7 +968,7 @@ else if ($action == 'confirm_modif' && $user->rights->commande->creer)
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 			{
 				$ret=$object->fetch($object->id);    // Reload to get new records
-				commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+				commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
 	}
@@ -1021,7 +1021,7 @@ else if ($action == 'up' && $user->rights->commande->creer)
 		$outputlangs->setDefaultLang($newlang);
 	}
 
-	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
 	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.GETPOST('rowid'));
 	exit;
@@ -1041,7 +1041,7 @@ else if ($action == 'down' && $user->rights->commande->creer)
 		$outputlangs = new Translate("",$conf);
 		$outputlangs->setDefaultLang($newlang);
 	}
-	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
 	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.GETPOST('rowid'));
 	exit;
@@ -1070,7 +1070,7 @@ else if ($action == 'builddoc')	// In get or post
 		$outputlangs = new Translate("",$conf);
 		$outputlangs->setDefaultLang($newlang);
 	}
-	$result=commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+	$result=commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
 	if ($result <= 0)
 	{
@@ -1491,7 +1491,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
 			print "<tr><td>".$langs->trans("DefaultContact").'</td><td colspan="2">';
 			$form->select_contacts($soc->id,$setcontact,'contactidp',1,$srccontactslist);
 			print '</td></tr>';
-		
+
 			// 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);
@@ -1684,7 +1684,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
 
 			print '<table class="noborder" width="100%">';
 
-			$objectsrc->printOriginLinesList($hookmanager);
+			$objectsrc->printOriginLinesList();
 
 			print '</table>';
 		}
@@ -2166,7 +2166,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
 
 			// Show object lines
 			if (! empty($object->lines))
-				$ret=$object->printObjectLines($action,$mysoc,$soc,$lineid,1,$hookmanager);
+				$ret=$object->printObjectLines($action,$mysoc,$soc,$lineid,1);
 
 			/*
 			 * Form to add new line
@@ -2180,18 +2180,18 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
 					if ($conf->global->MAIN_FEATURES_LEVEL > 1)
 					{
 						// Add free or predefined products/services
-						$object->formAddObjectLine(1,$mysoc,$soc,$hookmanager);
+						$object->formAddObjectLine(1,$mysoc,$soc);
 					}
 					else
 					{
 						// Add free products/services
-						$object->formAddFreeProduct(1,$mysoc,$soc,$hookmanager);
+						$object->formAddFreeProduct(1,$mysoc,$soc);
 
 						// Add predefined products/services
 						if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
 						{
 							$var=!$var;
-							$object->formAddPredefinedProduct(1,$mysoc,$soc,$hookmanager);
+							$object->formAddPredefinedProduct(1,$mysoc,$soc);
 						}
 					}
 
@@ -2354,7 +2354,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
 				$genallowed=$user->rights->commande->creer;
 				$delallowed=$user->rights->commande->supprimer;
 
-				$somethingshown=$formfile->show_documents('commande',$comref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang,$hookmanager);
+				$somethingshown=$formfile->show_documents('commande',$comref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
 
 				/*
 				 * Linked object block
@@ -2397,7 +2397,7 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
 						$outputlangs->setDefaultLang($newlang);
 					}
 
-					$result=commande_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+					$result=commande_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 					if ($result <= 0)
 					{
 						dol_print_error($db,$result);
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index f15762b97bf..4295e1f6fa9 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -117,7 +117,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->facture->c
     {
     	if ($object->fetch($id) > 0)
     	{
-    		$result=$object->createFromClone($socid, $hookmanager);
+    		$result=$object->createFromClone($socid);
     		if ($result > 0)
     		{
     			header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$result);
@@ -191,7 +191,7 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->
 		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 		{
 			$ret=$object->fetch($id);    // Reload to get new records
-			$result=facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+			$result=facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
 		if ($result >= 0)
 		{
@@ -394,7 +394,7 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->factu
             if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
             {
                 $ret=$object->fetch($id);    // Reload to get new records
-                facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+                facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
             }
         }
         else
@@ -471,7 +471,7 @@ else if ($action == 'confirm_modif' && ((empty($conf->global->MAIN_USE_ADVANCED_
 	        if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 	        {
                 $ret=$object->fetch($id);    // Reload to get new records
-	            facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+	            facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	        }
 	    }
     }
@@ -1184,7 +1184,7 @@ else if (($action == 'addline' || $action == 'addline_predef') && $user->rights-
         			}
 
         			$ret=$object->fetch($id);    // Reload to get new records
-        			facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+        			facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
         		}
 
         		unset($_POST['qty']);
@@ -1314,7 +1314,7 @@ else if ($action == 'updateligne' && $user->rights->facture->creer && $_POST['sa
 				}
 
 				$ret=$object->fetch($id);    // Reload to get new records
-				facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+				facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 
 			unset($_POST['qty']);
@@ -1360,7 +1360,7 @@ else if ($action == 'up' && $user->rights->facture->creer)
         $outputlangs = new Translate("",$conf);
         $outputlangs->setDefaultLang($newlang);
     }
-    if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+    if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
     header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$object->id.'#'.$_GET['rowid']);
     exit;
@@ -1382,7 +1382,7 @@ else if ($action == 'down' && $user->rights->facture->creer)
         $outputlangs = new Translate("",$conf);
         $outputlangs->setDefaultLang($newlang);
     }
-    if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+    if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
     header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$object->id.'#'.$_GET['rowid']);
     exit;
@@ -1614,7 +1614,7 @@ else if ($action == 'builddoc')	// En get ou en post
         $outputlangs = new Translate("",$conf);
         $outputlangs->setDefaultLang($newlang);
     }
-    $result=facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+    $result=facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
     if ($result <= 0)
     {
         dol_print_error($db,$result);
@@ -2186,7 +2186,7 @@ if ($action == 'create')
 
         print '<table class="noborder" width="100%">';
 
-        $objectsrc->printOriginLinesList($hookmanager);
+        $objectsrc->printOriginLinesList();
 
         print '</table>';
     }
@@ -3054,7 +3054,7 @@ else if ($id > 0 || ! empty($ref))
 
         // Show object lines
         if (! empty($object->lines))
-        	$ret=$object->printObjectLines($action,$mysoc,$soc,$lineid,1,$hookmanager);
+        	$ret=$object->printObjectLines($action,$mysoc,$soc,$lineid,1);
 
         /*
          * Form to add new line
@@ -3066,18 +3066,18 @@ else if ($id > 0 || ! empty($ref))
             if ($conf->global->MAIN_FEATURES_LEVEL > 1)
             {
             	// Add free or predefined products/services
-            	$object->formAddObjectLine(1,$mysoc,$soc,$hookmanager);
+            	$object->formAddObjectLine(1,$mysoc,$soc);
             }
             else
             {
             	// Add free products/services
-            	$object->formAddFreeProduct(1,$mysoc,$soc,$hookmanager);
+            	$object->formAddFreeProduct(1,$mysoc,$soc);
 
             	// Add predefined products/services
             	if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
             	{
             		$var=!$var;
-            		$object->formAddPredefinedProduct(1,$mysoc,$soc,$hookmanager);
+            		$object->formAddPredefinedProduct(1,$mysoc,$soc);
             	}
             }
 
@@ -3317,7 +3317,7 @@ else if ($id > 0 || ! empty($ref))
             $delallowed=$user->rights->facture->supprimer;
 
             print '<br>';
-            print $formfile->showdocuments('facture',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang,$hookmanager);
+            print $formfile->showdocuments('facture',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
             $somethingshown=$formfile->numoffiles;
 
             /*
@@ -3382,7 +3382,7 @@ else if ($id > 0 || ! empty($ref))
                     $outputlangs->setDefaultLang($newlang);
                 }
 
-                $result=facture_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+                $result=facture_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
                 if ($result <= 0)
                 {
                     dol_print_error($db,$result);
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 1637524cfce..b96fd57916d 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -541,7 +541,7 @@ class Facture extends CommonInvoice
 	 *		@param		HookManager		$hookmanager	Hook manager instance
      * 	 	@return		int								New id of clone
      */
-    function createFromClone($socid=0,$hookmanager=false)
+    function createFromClone($socid=0)
     {
         global $conf,$user,$langs;
 
diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php
index a3eaa76d463..50ce36d4e9c 100644
--- a/htdocs/compta/paiement/fiche.php
+++ b/htdocs/compta/paiement/fiche.php
@@ -112,7 +112,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->facture->
 				$outputlangs = new Translate("",$conf);
 				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
 			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $fac, $fac->modelpdf, $outputlangs, $hookmanager);
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $fac, $fac->modelpdf, $outputlangs);
 		}
 
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php
index 0bf129c567b..c8d710e2831 100644
--- a/htdocs/compta/payment_sc/fiche.php
+++ b/htdocs/compta/payment_sc/fiche.php
@@ -94,7 +94,7 @@ if ($_REQUEST['action'] == 'confirm_valide' && $_REQUEST['confirm'] == 'yes' &&
 				$outputlangs = new Translate("",$conf);
 				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
 			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $fac, $fac->modelpdf, $outputlangs, $hookmanager);
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) facture_pdf_create($db, $fac, $fac->modelpdf, $outputlangs);
 		}
 
 		header('Location: fiche.php?id='.$paiement->id);
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index d3a7f48c24b..9578bf54c98 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -209,7 +209,7 @@ else if ($action == 'addline' && $user->rights->contrat->creer)
     	setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description")),'errors');
     	$error++;
     }
-    
+
     if (! $error)
     {
         $ret=$object->fetch($id);
@@ -1282,7 +1282,7 @@ else
         if ($user->rights->contrat->creer && ($object->statut >= 0))
         {
         	$dateSelector=1;
-        	
+
             print '<br>';
             print '<table id="tablelines" class="noborder" width="100%">';	// Array with (n*2)+1 lines
 
@@ -1298,28 +1298,28 @@ else
         		if ($conf->global->MAIN_FEATURES_LEVEL > 1)
         		{
         			// Add free or predefined products/services
-        			$object->formAddObjectLine($dateSelector,$mysoc,$object->thirdparty,$hookmanager);
+        			$object->formAddObjectLine($dateSelector,$mysoc,$object->thirdparty);
         		}
         		else
         		{
         			// Add free products/services
-        			$object->formAddFreeProduct($dateSelector,$mysoc,$object->thirdparty,$hookmanager);
-        	
+        			$object->formAddFreeProduct($dateSelector,$mysoc,$object->thirdparty);
+
         			// Add predefined products/services
         			if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
         			{
         				$var=!$var;
-        				$object->formAddPredefinedProduct($dateSelector,$mysoc,$object->thirdparty,$hookmanager);
+        				$object->formAddPredefinedProduct($dateSelector,$mysoc,$object->thirdparty);
         			}
         		}
-        	
+
         		$parameters=array();
         		$reshook=$hookmanager->executeHooks('formAddObjectLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
         	}
-        	
+
         	// Restore correct setup
         	$conf->product->enabled = $savproductenabled;
-      
+
             print '</form>';
 
             print '</table>';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 344507971bb..5c9b8d93122 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2463,10 +2463,9 @@ abstract class CommonObject
      *  TODO Move this into html.class.php
      *  But for the moment we don't know if it's possible as we keep a method available on overloaded objects.
      *
-     *	@param	HookManager		$hookmanager		Hook manager instance
      *  @return	void
      */
-    function showLinkedObjectBlock($hookmanager=false)
+    function showLinkedObjectBlock()
     {
         global $conf,$langs,$hookmanager;
         global $bc;
@@ -2543,13 +2542,12 @@ abstract class CommonObject
      *  @param  int	    		$dateSelector       1=Show also date range input fields
      *  @param	Societe			$seller				Object thirdparty who sell
      *  @param	Societe			$buyer				Object thirdparty who buy
-     *	@param	HookManager		$hookmanager		Hook manager instance
      *	@return	void
      *	@deprecated
      */
-    function formAddPredefinedProduct($dateSelector,$seller,$buyer,$hookmanager=false)
+    function formAddPredefinedProduct($dateSelector,$seller,$buyer)
     {
-    	global $conf,$langs,$object;
+    	global $conf,$langs,$object,$hookmanager;
     	global $form,$bcnd,$var;
 
     	// Use global variables + $dateSelector + $seller and $buyer
@@ -2564,13 +2562,12 @@ abstract class CommonObject
      *  @param	int		        $dateSelector       1=Show also date range input fields
      *  @param	Societe			$seller				Object thirdparty who sell
      *  @param	Societe			$buyer				Object thirdparty who buy
-     *	@param	HookManager		$hookmanager		Hook manager instance
      *	@return	void
      *	@deprecated
      */
-    function formAddFreeProduct($dateSelector,$seller,$buyer,$hookmanager=false)
+    function formAddFreeProduct($dateSelector,$seller,$buyer)
     {
-    	global $conf,$langs,$object;
+    	global $conf,$langs,$object,$hookmanager;
     	global $form,$bcnd,$var;
 
     	// Use global variables + $dateSelector + $seller and $buyer
@@ -2586,12 +2583,11 @@ abstract class CommonObject
      *  @param	int		        $dateSelector       1=Show also date range input fields
      *  @param	Societe			$seller				Object thirdparty who sell
      *  @param	Societe			$buyer				Object thirdparty who buy
-     *	@param	HookManager		$hookmanager		Hook manager instance
      *	@return	void
      */
-	function formAddObjectLine($dateSelector,$seller,$buyer,$hookmanager=false)
+	function formAddObjectLine($dateSelector,$seller,$buyer)
 	{
-		global $conf,$user,$langs,$object;
+		global $conf,$user,$langs,$object,$hookmanager;
 		global $form,$bcnd,$var;
 
 		// Output template part (modules that overwrite templates must declare this into descriptor)
@@ -2625,12 +2621,11 @@ abstract class CommonObject
 	 *	@param  string  	$buyer             	Object of buyer third party
 	 *	@param	string		$selected		   	Object line selected
 	 *	@param  int	    	$dateSelector      	1=Show also date range input fields
-	 *	@param	HookManager	$hookmanager		Hookmanager
 	 *	@return	void
 	 */
-	function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0, $hookmanager=false)
+	function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0)
 	{
-		global $conf,$langs;
+		global $conf,$langs,$hookmanager;
 
 		print '<tr class="liste_titre nodrag nodrop">';
 		if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
@@ -2698,12 +2693,11 @@ abstract class CommonObject
 	 *	@param  string	    $seller            	Object of seller third party
 	 *	@param  string	    $buyer             	Object of buyer third party
 	 *	@param	string		$selected		   	Object line selected
-	 *	@param	HookManager	$hookmanager		Hook manager
 	 *	@return	void
 	 */
-	function printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected=0,$hookmanager=false)
+	function printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected=0)
 	{
-		global $conf,$langs,$user;
+		global $conf,$langs,$user,$hookmanager;
 		global $form,$bc,$bcdd;
 
 		$element=$this->element;
@@ -2808,12 +2802,11 @@ abstract class CommonObject
      *  If lines are into a template, title must also be into a template
      *  But for the moment we don't know if it's possible as we keep a method available on overloaded objects.
      *
-     *  @param	HookManager	$hookmanager		Hook manager
      *  @return	void
      */
-    function printOriginLinesList($hookmanager=false)
+    function printOriginLinesList()
     {
-        global $langs;
+        global $langs, $hookmanager;
 
         print '<tr class="liste_titre">';
         print '<td>'.$langs->trans('Ref').'</td>';
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 83818285265..525b163d994 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -161,13 +161,12 @@ class FormFile
      * 		@param		string				$title				Title to show on top of form
      * 		@param		string				$buttonlabel		Label on submit button
      * 		@param		string				$codelang			Default language code to use on lang combo box if multilang is enabled
-     * 		@param		HookManager			$hookmanager		Object hookmanager with instance of external modules hook classes
      * 		@return		int										<0 if KO, number of shown files if OK
      */
-    function show_documents($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$hookmanager=false)
+    function show_documents($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='')
     {
         $this->numoffiles=0;
-        print $this->showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$maxfilenamelength,$noform,$param,$title,$buttonlabel,$codelang,$hookmanager);
+        print $this->showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed,$modelselected,$allowgenifempty,$forcenomultilang,$iconPDF,$maxfilenamelength,$noform,$param,$title,$buttonlabel,$codelang);
         return $this->numoffiles;
     }
 
@@ -191,15 +190,15 @@ class FormFile
      * 		@param		string				$title				Title to show on top of form
      * 		@param		string				$buttonlabel		Label on submit button
      * 		@param		string				$codelang			Default language code to use on lang combo box if multilang is enabled
-     * 		@param		HookManager			$hookmanager		Object hookmanager with instance of external modules hook classes
      * 		@return		string              					Output string with HTML array of documents (might be empty string)
      */
-    function showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$hookmanager=false)
+    function showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='')
     {
         // filedir = conf->...dir_ouput."/".get_exdir(id)
         include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        global $langs,$bc,$conf;
+        global $langs,$conf,$hookmanager;
+        global $bc;
 
         // For backward compatibility
         if (! empty($iconPDF)) {
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 481e1751ef0..e07c660fddc 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -792,12 +792,11 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
  *	@param	float		$h					Cell minimum height. The cell extends automatically if needed.
  *	@param	int			$align				Align
  *	@param	string		$default_font_size	Font size
- *	@param	HookManager	$hookmanager		Hook manager object
  *	@return	void
  */
-function pdf_writeLinkedObjects(&$pdf,$object,$outputlangs,$posx,$posy,$w,$h,$align,$default_font_size,$hookmanager=false)
+function pdf_writeLinkedObjects(&$pdf,$object,$outputlangs,$posx,$posy,$w,$h,$align,$default_font_size)
 {
-	$linkedobjects = pdf_getLinkedObjects($object,$outputlangs,$hookmanager);
+	$linkedobjects = pdf_getLinkedObjects($object,$outputlangs);
 	if (! empty($linkedobjects))
 	{
 		foreach($linkedobjects as $linkedobject)
@@ -833,12 +832,11 @@ function pdf_writeLinkedObjects(&$pdf,$object,$outputlangs,$posx,$posy,$w,$h,$al
  *  @param  int				$hideref       		Hide reference
  *  @param  int				$hidedesc            Hide description
  * 	@param	int				$issupplierline		Is it a line for a supplier object ?
- * 	@param	HookManager		$hookmanager		Instance of HookManager
  * 	@return	void
  */
-function pdf_writelinedesc(&$pdf,$object,$i,$outputlangs,$w,$h,$posx,$posy,$hideref=0,$hidedesc=0,$issupplierline=0,$hookmanager=false)
+function pdf_writelinedesc(&$pdf,$object,$i,$outputlangs,$w,$h,$posx,$posy,$hideref=0,$hidedesc=0,$issupplierline=0)
 {
-	global $db, $conf, $langs;
+	global $db, $conf, $langs, $hookmanager;
 
 	if (is_object($hookmanager) && ( ($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	{
@@ -1002,9 +1000,11 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
  *  @param	HookManager	$hookmanager		Hook manager instance
  * 	@return	void
  */
-function pdf_getlinenum($object,$i,$outputlangs,$hidedetails=0,$hookmanager=false)
+function pdf_getlinenum($object,$i,$outputlangs,$hidedetails=0)
 {
-	if (! empty($object->hooks) && ( ($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	global $hookmanager;
+
+	if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
 	{
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
@@ -1024,12 +1024,13 @@ function pdf_getlinenum($object,$i,$outputlangs,$hidedetails=0,$hookmanager=fals
  *	@param	int			$i					Current line number
  *  @param  Translate	$outputlangs		Object langs for output
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
- *  @param	HookManager	$hookmanager		Hook manager instance
  * 	@return	void
  */
-function pdf_getlineref($object,$i,$outputlangs,$hidedetails=0,$hookmanager=false)
+function pdf_getlineref($object,$i,$outputlangs,$hidedetails=0)
 {
-	if (! empty($object->hooks) && ( ($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	global $hookmanager;
+
+	if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
 	{
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
@@ -1048,12 +1049,13 @@ function pdf_getlineref($object,$i,$outputlangs,$hidedetails=0,$hookmanager=fals
  *	@param	int			$i					Current line number
  *  @param  Translate	$outputlangs		Object langs for output
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
- *  @param	HookManager	$hookmanager		Hook manager instance
  * 	@return	void
  */
-function pdf_getlineref_supplier($object,$i,$outputlangs,$hidedetails=0,$hookmanager=false)
+function pdf_getlineref_supplier($object,$i,$outputlangs,$hidedetails=0)
 {
-	if (! empty($object->hooks) && ( ($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	global $hookmanager;
+
+	if (is_object($hookmanager) && ( ($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
 	{
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
@@ -1072,12 +1074,13 @@ function pdf_getlineref_supplier($object,$i,$outputlangs,$hidedetails=0,$hookman
  *	@param	int			$i					Current line number
  *  @param  Translate	$outputlangs		Object langs for output
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
- *  @param	HookManager	$hookmanager		Hook manager instance
  * 	@return	void
  */
-function pdf_getlinevatrate($object,$i,$outputlangs,$hidedetails=0,$hookmanager=false)
+function pdf_getlinevatrate($object,$i,$outputlangs,$hidedetails=0)
 {
-	if (is_object($hookmanager) && ( ($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
+	global $hookmanager;
+
+	if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
 	{
 		$special_code = $object->lines[$i]->special_code;
 		if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
@@ -1098,12 +1101,11 @@ function pdf_getlinevatrate($object,$i,$outputlangs,$hidedetails=0,$hookmanager=
  *	@param	int			$i					Current line number
  *  @param  Translate	$outputlangs		Object langs for output
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
- *  @param	HookManager	$hookmanager		Hook manager instance
  * 	@return	void
  */
-function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0,$hookmanager=false)
+function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0)
 {
-    global $conf;
+    global $conf, $hookmanager;
 
     $sign=1;
     if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
@@ -1133,7 +1135,9 @@ function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0,$hookmanage
  */
 function pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails=0)
 {
-    if (! empty($object->hooks) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
+	global $hookmanager;
+
+    if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
     {
         $special_code = $object->lines[$i]->special_code;
     	if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
@@ -1155,11 +1159,12 @@ function pdf_getlineupwithtax($object,$i,$outputlangs,$hidedetails=0)
  *	@param	int			$i					Current line number
  *  @param  Translate	$outputlangs		Object langs for output
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
- *  @param	HookManager	$hookmanager		Hook manager instance
  *  @return	void
  */
-function pdf_getlineqty($object,$i,$outputlangs,$hidedetails=0,$hookmanager=false)
+function pdf_getlineqty($object,$i,$outputlangs,$hidedetails=0)
 {
+	global $hookmanager;
+
 	if ($object->lines[$i]->special_code != 3)
 	{
 		if (is_object($hookmanager) && (( $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
@@ -1184,11 +1189,12 @@ function pdf_getlineqty($object,$i,$outputlangs,$hidedetails=0,$hookmanager=fals
  *	@param	int			$i					Current line number
  *  @param  Translate	$outputlangs		Object langs for output
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
- *  @param	HookManager	$hookmanager		Hook manager instance
  * 	@return	void
  */
-function pdf_getlineqty_asked($object,$i,$outputlangs,$hidedetails=0,$hookmanager=false)
+function pdf_getlineqty_asked($object,$i,$outputlangs,$hidedetails=0)
 {
+	global $hookmanager;
+
 	if ($object->lines[$i]->special_code != 3)
 	{
 		if (is_object($hookmanager) && (( $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
@@ -1213,11 +1219,12 @@ function pdf_getlineqty_asked($object,$i,$outputlangs,$hidedetails=0,$hookmanage
  *	@param	int			$i					Current line number
  *  @param  Translate	$outputlangs		Object langs for output
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
- *  @param	HookManager	$hookmanager		Hook manager instance
  * 	@return	void
  */
-function pdf_getlineqty_shipped($object,$i,$outputlangs,$hidedetails=0,$hookmanager=false)
+function pdf_getlineqty_shipped($object,$i,$outputlangs,$hidedetails=0)
 {
+	global $hookmanager;
+
 	if ($object->lines[$i]->special_code != 3)
 	{
 		if (is_object($hookmanager) && (( $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
@@ -1242,11 +1249,12 @@ function pdf_getlineqty_shipped($object,$i,$outputlangs,$hidedetails=0,$hookmana
  *	@param	int			$i					Current line number
  *  @param  Translate	$outputlangs		Object langs for output
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
- *  @param	HookManager	$hookmanager		Hook manager instance
  * 	@return	void
  */
-function pdf_getlineqty_keeptoship($object,$i,$outputlangs,$hidedetails=0,$hookmanager=false)
+function pdf_getlineqty_keeptoship($object,$i,$outputlangs,$hidedetails=0)
 {
+	global $hookmanager;
+
 	if ($object->lines[$i]->special_code != 3)
 	{
 		if (is_object($hookmanager) && (( $object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
@@ -1271,11 +1279,12 @@ function pdf_getlineqty_keeptoship($object,$i,$outputlangs,$hidedetails=0,$hookm
  *	@param	int			$i					Current line number
  *  @param  Translate	$outputlangs		Object langs for output
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
- *  @param	HookManager	$hookmanager		Hook manager instance
  * 	@return	void
  */
-function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0,$hookmanager=false)
+function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0)
 {
+	global $hookmanager;
+
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 	if ($object->lines[$i]->special_code != 3)
@@ -1302,12 +1311,11 @@ function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0,$hookma
  *	@param	int			$i					Current line number
  *  @param  Translate	$outputlangs		Object langs for output
  *  @param	int			$hidedetails		Hide details (0=no, 1=yes, 2=just special lines)
- *  @param	HookManager	$hookmanager		Hook manager instance
  * 	@return	void
  */
-function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0,$hookmanager=false)
+function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0)
 {
-    global $conf;
+    global $conf, $hookmanager;
 
     $sign=1;
     if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
@@ -1344,13 +1352,15 @@ function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0,$hookman
  */
 function pdf_getlinetotalwithtax($object,$i,$outputlangs,$hidedetails=0)
 {
+	global $hookmanager;
+
     if ($object->lines[$i]->special_code == 3)
     {
         return $outputlangs->transnoentities("Option");
     }
     else
     {
-        if (! empty($object->hooks) && (($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
+        if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
         {
         	$special_code = $object->lines[$i]->special_code;
         	if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
@@ -1373,11 +1383,12 @@ function pdf_getlinetotalwithtax($object,$i,$outputlangs,$hidedetails=0)
  *	@param	Object		$object				Object
  *	@param	string		$type				Type
  *  @param  Translate	$outputlangs		Object langs for output
- *  @param	HookManager	$hookmanager		Hook manager instance
  * 	@return	void
  */
-function pdf_getTotalQty($object,$type,$outputlangs,$hookmanager=false)
+function pdf_getTotalQty($object,$type,$outputlangs)
 {
+	global $hookmanager;
+
 	$total=0;
 	$nblignes=count($object->lines);
 
@@ -1390,7 +1401,7 @@ function pdf_getTotalQty($object,$type,$outputlangs,$hookmanager=false)
 			{
 				$total += $object->lines[$i]->qty;
 			}
-			else if ($type==9 && ! empty($object->hooks) && ( ($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code) ) || ! empty($object->lines[$i]->fk_parent_line) ) )
+			else if ($type==9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line)))
 			{
 				$special_code = $object->lines[$i]->special_code;
 				if (! empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
@@ -1415,11 +1426,12 @@ function pdf_getTotalQty($object,$type,$outputlangs,$hookmanager=false)
  *
  * 	@param	object		$object			Object
  * 	@param	Translate	$outputlangs	Object lang for output
- *	@param	HookManager	$hookmanager	Hook manager instance
  * 	@return	void
  */
-function pdf_getLinkedObjects($object,$outputlangs,$hookmanager=false)
+function pdf_getLinkedObjects($object,$outputlangs)
 {
+	global $hookmanager;
+
 	$linkedobjects=array();
 
 	$object->fetchObjectLinked();
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index aa156eaf412..0ad0ecc0e7e 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -238,12 +238,11 @@ class doc_generic_order_odt extends ModelePDFCommandes
      *  @param		int			$hidedetails		Do not show line details
      *  @param		int			$hidedesc			Do not show desc
      *  @param		int			$hideref			Do not show ref
-     *  @param		object		$hookmanager		Hookmanager object
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
+	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
 	{
-		global $user,$langs,$conf,$mysoc;
+		global $user,$langs,$conf,$mysoc,$hookmanager;
 
 		if (empty($srctemplatepath))
 		{
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index a9b1e89ece9..cff6d9b099f 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -133,12 +133,11 @@ class pdf_einstein extends ModelePDFCommandes
      *  @param		int			$hidedetails		Do not show line details
      *  @param		int			$hidedesc			Do not show desc
      *  @param		int			$hideref			Do not show ref
-     *  @param		object		$hookmanager		Hookmanager object
      *  @return     int             			1=OK, 0=KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
+	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
 	{
-		global $user,$langs,$conf,$mysoc,$db;
+		global $user,$langs,$conf,$mysoc,$db,$hookmanager;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -230,7 +229,7 @@ class pdf_einstein extends ModelePDFCommandes
 				$pdf->AddPage();
 				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
-				$this->_pagehead($pdf, $object, 1, $outputlangs, $hookmanager);
+				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('','', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, '');		// Set interline to 3
 				$pdf->SetTextColor(0,0,0);
@@ -284,7 +283,7 @@ class pdf_einstein extends ModelePDFCommandes
 					$showpricebeforepagebreak=1;
 
 					$pdf->startTransaction();
-					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc,0,$hookmanager);
+					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc);
 					$pageposafter=$pdf->getPage();
 					if ($pageposafter > $pageposbefore)	// There is a pagebreak
 					{
@@ -292,7 +291,7 @@ class pdf_einstein extends ModelePDFCommandes
 						$pageposafter=$pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
 						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc,0,$hookmanager);
+						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc);
 						$posyafter=$pdf->GetY();
 						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
 						{
@@ -300,7 +299,7 @@ class pdf_einstein extends ModelePDFCommandes
 							{
 								$pdf->AddPage('','',true);
 								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager);
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pagenb+1);
 							}
 						}
@@ -331,18 +330,18 @@ class pdf_einstein extends ModelePDFCommandes
 					// VAT Rate
 					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
 					{
-						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxtva, $curY);
 						$pdf->MultiCell($this->posxup-$this->posxtva-1, 3, $vat_rate, 0, 'R');
 					}
 
 					// Unit price before discount
-					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails, $hookmanager);
+					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->posxup, $curY);
 					$pdf->MultiCell($this->posxqty-$this->posxup-1, 3, $up_excl_tax, 0, 'R', 0);
 
 					// Quantity
-					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails, $hookmanager);
+					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->posxqty, $curY);
 					$pdf->MultiCell($this->posxdiscount-$this->posxqty-1, 3, $qty, 0, 'R');	// Enough for 6 chars
 
@@ -350,12 +349,12 @@ class pdf_einstein extends ModelePDFCommandes
 					if ($object->lines[$i]->remise_percent)
 					{
 						$pdf->SetXY($this->posxdiscount-2, $curY);
-						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
 						$pdf->MultiCell($this->postotalht-$this->posxdiscount+2, 3, $remise_percent, 0, 'R');
 					}
 
 					// Total HT line
-					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails, $hookmanager);
+					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->postotalht, $curY);
 					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
@@ -426,7 +425,7 @@ class pdf_einstein extends ModelePDFCommandes
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					}
 					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
 					{
@@ -443,7 +442,7 @@ class pdf_einstein extends ModelePDFCommandes
 						$pdf->AddPage();
 						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					}
 				}
 
@@ -1041,12 +1040,11 @@ class pdf_einstein extends ModelePDFCommandes
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
-	 *  @param	object		$hookmanager	Hookmanager object
 	 *  @return	void
 	 */
-	function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $hookmanager)
+	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
-		global $conf,$langs;
+		global $conf,$langs,$hookmanager;
 
 		$outputlangs->load("main");
 		$outputlangs->load("bills");
@@ -1125,7 +1123,7 @@ class pdf_einstein extends ModelePDFCommandes
 		$posy+=2;
 
 		// Show list of linked objects
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size, $hookmanager);
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
 
 		if ($showaddress)
 		{
diff --git a/htdocs/core/modules/commande/modules_commande.php b/htdocs/core/modules/commande/modules_commande.php
index 8ebd473876d..aa52d55bad3 100644
--- a/htdocs/core/modules/commande/modules_commande.php
+++ b/htdocs/core/modules/commande/modules_commande.php
@@ -157,12 +157,11 @@ abstract class ModeleNumRefCommandes
  *  @param      int			$hidedetails    Hide details of lines
  *  @param      int			$hidedesc       Hide description
  *  @param      int			$hideref        Hide ref
- *  @param      HookManager	$hookmanager	Hook manager instance
  *  @return     int         				0 if KO, 1 if OK
  */
-function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
+function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
-	global $conf,$user,$langs;
+	global $conf,$user,$langs,$hookmanager;
 	$langs->load("orders");
 
 	$error=0;
@@ -223,7 +222,7 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
 		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $hookmanager) > 0)
+		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 
diff --git a/htdocs/core/modules/dons/modules_don.php b/htdocs/core/modules/dons/modules_don.php
index 24816e4141a..ff05e6d8262 100644
--- a/htdocs/core/modules/dons/modules_don.php
+++ b/htdocs/core/modules/dons/modules_don.php
@@ -222,7 +222,7 @@ function don_create($db, $id, $message, $modele, $outputlangs)
         // We save charset_output to restore it because write_file can change it if needed for
         // output format that does not support UTF8.
         $sav_charset_output=$outputlangs->charset_output;
-        if ($obj->write_file($object,$outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $hookmanager) > 0)
+        if ($obj->write_file($object,$outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
         {
             $outputlangs->charset_output=$sav_charset_output;
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
index 42598a2094d..c2f8da7c0e2 100644
--- a/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
@@ -78,12 +78,11 @@ class pdf_expedition_merou extends ModelePdfExpedition
      *  @param		int			$hidedetails		Do not show line details
      *  @param		int			$hidedesc			Do not show desc
      *  @param		int			$hideref			Do not show ref
-     *  @param		object		$hookmanager		Hookmanager object
      *  @return     int         	    			1=OK, 0=KO
 	 */
-	function write_file(&$object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
+	function write_file(&$object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
 	{
-		global $user,$conf,$langs,$mysoc;
+		global $user,$conf,$langs,$mysoc,$hookmanager;
 
 		$object->fetch_thirdparty();
 
@@ -183,7 +182,7 @@ class pdf_expedition_merou extends ModelePdfExpedition
 				// New page
 				$pdf->AddPage();
 				$pagenb++;
-				$this->_pagehead($pdf, $object, 1, $outputlangs, $hookmanager);
+				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('','', $default_font_size - 3);
 				$pdf->MultiCell(0, 3, '');		// Set interline to 3
 				$pdf->SetTextColor(0,0,0);
diff --git a/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
index e3113689726..b458a5a3a42 100644
--- a/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
@@ -81,12 +81,11 @@ class pdf_expedition_rouget extends ModelePdfExpedition
      *  @param		int			$hidedetails		Do not show line details
      *  @param		int			$hidedesc			Do not show desc
      *  @param		int			$hideref			Do not show ref
-     *  @param		object		$hookmanager		Hookmanager object
      *  @return     int         	    			1=OK, 0=KO
 	 */
-	function write_file(&$object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
+	function write_file(&$object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
 	{
-		global $user,$conf,$langs;
+		global $user,$conf,$langs,$hookmanager;
 
 		$object->fetch_thirdparty();
 
@@ -170,7 +169,7 @@ class pdf_expedition_rouget extends ModelePdfExpedition
 				$pdf->AddPage();
 				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
-				$this->_pagehead($pdf, $object, 1, $outputlangs, $hookmanager);
+				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('','', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, '');		// Set interline to 3
 				$pdf->SetTextColor(0,0,0);
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index 35cb6851886..dcf8436636d 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -250,12 +250,11 @@ class doc_generic_invoice_odt extends ModelePDFFactures
      *  @param		int			$hidedetails		Do not show line details
      *  @param		int			$hidedesc			Do not show desc
      *  @param		int			$hideref			Do not show ref
-     *  @param		object		$hookmanager		Hookmanager object
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
+	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
 	{
-		global $user,$langs,$conf,$mysoc;
+		global $user,$langs,$conf,$mysoc,$hookmanager;
 
 		if (empty($srctemplatepath))
 		{
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index e12a4984104..bfa48ceed37 100755
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -134,12 +134,11 @@ class pdf_crabe extends ModelePDFFactures
      *  @param		int			$hidedetails		Do not show line details
      *  @param		int			$hidedesc			Do not show desc
      *  @param		int			$hideref			Do not show ref
-     *  @param		object		$hookmanager		Hookmanager object
      *  @return     int         	    			1=OK, 0=KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
+	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
 	{
-		global $user,$langs,$conf,$mysoc,$db;
+		global $user,$langs,$conf,$mysoc,$db,$hookmanager;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -232,7 +231,7 @@ class pdf_crabe extends ModelePDFFactures
 				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
 
-				$this->_pagehead($pdf, $object, 1, $outputlangs, $hookmanager);
+				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('','', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, '');		// Set interline to 3
 				$pdf->SetTextColor(0,0,0);
@@ -285,7 +284,7 @@ class pdf_crabe extends ModelePDFFactures
 					$showpricebeforepagebreak=1;
 
 					$pdf->startTransaction();
-					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc,0,$hookmanager);
+					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc);
 					$pageposafter=$pdf->getPage();
 					if ($pageposafter > $pageposbefore)	// There is a pagebreak
 					{
@@ -293,7 +292,7 @@ class pdf_crabe extends ModelePDFFactures
 						$pageposafter=$pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
 						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc,0,$hookmanager);
+						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc);
 						$pageposafter=$pdf->getPage();
 						$posyafter=$pdf->GetY();
 						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
@@ -303,7 +302,7 @@ class pdf_crabe extends ModelePDFFactures
 							{
 								$pdf->AddPage('','',true);
 								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager);
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pagenb+1);
 							}
 						}
@@ -334,18 +333,18 @@ class pdf_crabe extends ModelePDFFactures
 					// VAT Rate
 					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
 					{
-						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxtva, $curY);
 						$pdf->MultiCell($this->posxup-$this->posxtva-1, 3, $vat_rate, 0, 'R');
 					}
 
 					// Unit price before discount
-					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails, $hookmanager);
+					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->posxup, $curY);
 					$pdf->MultiCell($this->posxqty-$this->posxup-1, 3, $up_excl_tax, 0, 'R', 0);
 
 					// Quantity
-					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails, $hookmanager);
+					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->posxqty, $curY);
 					$pdf->MultiCell($this->posxdiscount-$this->posxqty-1, 3, $qty, 0, 'R');	// Enough for 6 chars
 
@@ -353,12 +352,12 @@ class pdf_crabe extends ModelePDFFactures
 					if ($object->lines[$i]->remise_percent)
 					{
                         $pdf->SetXY($this->posxdiscount-2, $curY);
-					    $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails, $hookmanager);
+					    $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
 						$pdf->MultiCell($this->postotalht-$this->posxdiscount+2, 3, $remise_percent, 0, 'R');
 					}
 
 					// Total HT line
-					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails, $hookmanager);
+					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->postotalht, $curY);
 					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
@@ -428,7 +427,7 @@ class pdf_crabe extends ModelePDFFactures
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					}
 					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
 					{
@@ -445,7 +444,7 @@ class pdf_crabe extends ModelePDFFactures
 						$pdf->AddPage();
 						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					}
 				}
 
@@ -1194,10 +1193,9 @@ class pdf_crabe extends ModelePDFFactures
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
-	 *  @param	object		$hookmanager	Hookmanager object
 	 *  @return	void
 	 */
-	function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $hookmanager)
+	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $conf,$langs;
 
@@ -1331,7 +1329,7 @@ class pdf_crabe extends ModelePDFFactures
 		$posy+=1;
 
 		// Show list of linked objects
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size, $hookmanager);
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
 
 		if ($showaddress)
 		{
diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php
index 42462c9b246..865d1f578bd 100644
--- a/htdocs/core/modules/facture/modules_facture.php
+++ b/htdocs/core/modules/facture/modules_facture.php
@@ -152,10 +152,9 @@ abstract class ModeleNumRefFactures
  *  @param  int			$hidedetails    Hide details of lines
  *  @param  int			$hidedesc       Hide description
  *  @param  int			$hideref        Hide ref
- *  @param  HookManager	$hookmanager	Hook manager instance
  *	@return int        					<0 if KO, >0 if OK
  */
-function facture_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
+function facture_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
 	global $conf,$user,$langs;
 
@@ -224,7 +223,7 @@ function facture_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
 		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $hookmanager) > 0)
+		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 953466ec88a..d40dfb3c8f3 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -101,10 +101,9 @@ class pdf_soleil extends ModelePDFFicheinter
      *  @param		int		$hidedetails		Do not show line details
      *  @param		int		$hidedesc			Do not show desc
      *  @param		int		$hideref			Do not show ref
-     *  @param		object	$hookmanager		Hookmanager object
      *  @return     int             			1=OK, 0=KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
+	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
 	{
 		global $user,$langs,$conf,$mysoc;
 
@@ -174,7 +173,7 @@ class pdf_soleil extends ModelePDFFicheinter
 				$pdf->AddPage();
 				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
-				$this->_pagehead($pdf, $object, 1, $outputlangs, $hookmanager);
+				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('','', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, '');		// Set interline to 3
 				$pdf->SetTextColor(0,0,0);
diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php
index 545a6979491..cb0336f2bd2 100644
--- a/htdocs/core/modules/fichinter/modules_fichinter.php
+++ b/htdocs/core/modules/fichinter/modules_fichinter.php
@@ -151,10 +151,9 @@ abstract class ModeleNumRefFicheinter
  *  @param  int			$hidedetails    Hide details of lines
  *  @param  int			$hidedesc       Hide description
  *  @param  int			$hideref        Hide ref
- *  @param  HookManager	$hookmanager	Hook manager instance
  *  @return int         				0 if KO, 1 if OK
  */
-function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
+function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
 	global $conf,$langs,$user;
 	$langs->load("ficheinter");
@@ -216,7 +215,7 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails=0, $
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
 		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $hookmanager) > 0)
+		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 
diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php
index fc0260a0be2..6aae57c34d5 100644
--- a/htdocs/core/modules/project/modules_project.php
+++ b/htdocs/core/modules/project/modules_project.php
@@ -110,7 +110,7 @@ abstract class ModeleNumRefProjects
 
 	/**
 	 *  Renvoi prochaine valeur attribuee
-	 *	
+	 *
 	 *	@param	Societe		$objsoc		Object third party
 	 *	@param	Project		$project	Object project
 	 *	@return	string					Valeur
@@ -149,10 +149,9 @@ abstract class ModeleNumRefProjects
  *  @param  int			$hidedetails    Hide details of lines
  *  @param  int			$hidedesc       Hide description
  *  @param  int			$hideref        Hide ref
- *  @param  HookManager	$hookmanager	Hook manager instance
  *  @return int         				0 if KO, 1 if OK
  */
-function project_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
+function project_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
 	global $conf,$langs;
 	$langs->load("projects");
@@ -214,7 +213,7 @@ function project_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
 		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $hookmanager) > 0)
+		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index 812fb81a859..be0ac3f7d3f 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -237,12 +237,11 @@ class doc_generic_proposal_odt extends ModelePDFPropales
      *  @param		int			$hidedetails		Do not show line details
      *  @param		int			$hidedesc			Do not show desc
      *  @param		int			$hideref			Do not show ref
-     *  @param		object		$hookmanager		Hookmanager object
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
+	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
 	{
-		global $user,$langs,$conf,$mysoc;
+		global $user,$langs,$conf,$mysoc,$hookmanager;
 
 		if (empty($srctemplatepath))
 		{
@@ -485,11 +484,6 @@ class doc_generic_proposal_odt extends ModelePDFPropales
                 }
 
 				// Add odtgeneration hook
-				if (! is_object($hookmanager))
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
-				}
 				$hookmanager->initHooks(array('odtgeneration'));
 				$parameters=array('odfHandler'=>$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
 				global $action;
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 3a76d61f7f3..43f2bab3940 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -132,12 +132,11 @@ class pdf_azur extends ModelePDFPropales
      *  @param		int			$hidedetails		Do not show line details
      *  @param		int			$hidedesc			Do not show desc
      *  @param		int			$hideref			Do not show ref
-     *  @param		object		$hookmanager		Hookmanager object
      *  @return     int             				1=OK, 0=KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
+	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
 	{
-		global $user,$langs,$conf,$mysoc,$db;
+		global $user,$langs,$conf,$mysoc,$db,$hookmanager;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -229,7 +228,7 @@ class pdf_azur extends ModelePDFPropales
 				$pdf->AddPage();
 				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
-				$this->_pagehead($pdf, $object, 1, $outputlangs, $hookmanager);
+				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('','', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, '');		// Set interline to 3
 				$pdf->SetTextColor(0,0,0);
@@ -282,7 +281,7 @@ class pdf_azur extends ModelePDFPropales
 					$showpricebeforepagebreak=1;
 
 					$pdf->startTransaction();
-					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc,0,$hookmanager);
+					pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc);
 					$pageposafter=$pdf->getPage();
 					if ($pageposafter > $pageposbefore)	// There is a pagebreak
 					{
@@ -290,7 +289,7 @@ class pdf_azur extends ModelePDFPropales
 						$pageposafter=$pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
 						$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc,0,$hookmanager);
+						pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc);
 						$pageposafter=$pdf->getPage();
 						$posyafter=$pdf->GetY();
 						if ($posyafter > ($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot)))	// There is no space left for total+free text
@@ -299,7 +298,7 @@ class pdf_azur extends ModelePDFPropales
 							{
 								$pdf->AddPage('','',true);
 								if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager);
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 								$pdf->setPage($pagenb+1);
 							}
 						}
@@ -330,18 +329,18 @@ class pdf_azur extends ModelePDFPropales
 					// VAT Rate
 					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
 					{
-						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxtva, $curY);
 						$pdf->MultiCell($this->posxup-$this->posxtva-1, 3, $vat_rate, 0, 'R');
 					}
 
 					// Unit price before discount
-					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails, $hookmanager);
+					$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->posxup, $curY);
 					$pdf->MultiCell($this->posxqty-$this->posxup-1, 3, $up_excl_tax, 0, 'R', 0);
 
 					// Quantity
-					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails, $hookmanager);
+					$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->posxqty, $curY);
 					$pdf->MultiCell($this->posxdiscount-$this->posxqty-1, 3, $qty, 0, 'R');	// Enough for 6 chars
 
@@ -349,12 +348,12 @@ class pdf_azur extends ModelePDFPropales
 					if ($object->lines[$i]->remise_percent)
 					{
 						$pdf->SetXY($this->posxdiscount-2, $curY);
-						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
 						$pdf->MultiCell($this->postotalht-$this->posxdiscount+2, 3, $remise_percent, 0, 'R');
 					}
 
 					// Total HT line
-					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails, $hookmanager);
+					$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
 					$pdf->SetXY($this->postotalht, $curY);
 					$pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
@@ -423,7 +422,7 @@ class pdf_azur extends ModelePDFPropales
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					}
 					if (isset($object->lines[$i+1]->pagebreak) && $object->lines[$i+1]->pagebreak)
 					{
@@ -440,7 +439,7 @@ class pdf_azur extends ModelePDFPropales
 						$pdf->AddPage();
 						if (! empty($tplidx)) $pdf->useTemplate($tplidx);
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs, $hookmanager);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 					}
 				}
 
@@ -480,11 +479,6 @@ class pdf_azur extends ModelePDFPropales
 				$pdf->Output($file,'F');
 
 				//Add pdfgeneration hook
-				if (! is_object($hookmanager))
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
-				}
 				$hookmanager->initHooks(array('pdfgeneration'));
 				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
 				global $action;
@@ -1088,10 +1082,9 @@ class pdf_azur extends ModelePDFPropales
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
-	 *  @param	object		$hookmanager	Hookmanager object
 	 *  @return	void
 	 */
-	function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $hookmanager)
+	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $conf,$langs;
 
@@ -1186,7 +1179,7 @@ class pdf_azur extends ModelePDFPropales
 		$posy+=2;
 
 		// Show list of linked objects
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size, $hookmanager);
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
 
 		if ($showaddress)
 		{
diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php
index d26193d2a1b..b5a25954df9 100644
--- a/htdocs/core/modules/propale/modules_propale.php
+++ b/htdocs/core/modules/propale/modules_propale.php
@@ -153,10 +153,9 @@ abstract class ModeleNumRefPropales
  *  @param      int			$hidedetails    Hide details of lines
  *  @param      int			$hidedesc       Hide description
  *  @param      int			$hideref        Hide ref
- *  @param      HookManager	$hookmanager	Hook manager instance
  * 	@return     int         				0 if KO, 1 if OK
  */
-function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
+function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
 	global $conf,$user,$langs;
 	$langs->load("propale");
@@ -219,7 +218,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
 		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $hookmanager) > 0)
+		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 
diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index cc5c08f7431..0146ebfc253 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -161,12 +161,11 @@ class doc_generic_odt extends ModeleThirdPartyDoc
      *  @param		int			$hidedetails		Do not show line details
      *  @param		int			$hidedesc			Do not show desc
      *  @param		int			$hideref			Do not show ref
-     *  @param		object		$hookmanager		Hookmanager object
 	 *	@return		int         					1 if OK, <=0 if KO
 	 */
-	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
+	function write_file($object,$outputlangs,$srctemplatepath,$hidedetails=0,$hidedesc=0,$hideref=0)
 	{
-		global $user,$langs,$conf,$mysoc;
+		global $user,$langs,$conf,$mysoc,$hookmanager;
 
 		if (empty($srctemplatepath))
 		{
@@ -298,11 +297,6 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				}
 
 				// Add odtgeneration hook
-				if (! is_object($hookmanager))
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
-				}
 				$hookmanager->initHooks(array('odtgeneration'));
 				$parameters=array('odfHandler'=>$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
 				global $action;
diff --git a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
index d29abaa08a0..5d409dd6c67 100755
--- a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
+++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
@@ -65,10 +65,9 @@ abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator
  *  @param      int			$hidedetails    Hide details of lines
  *  @param      int			$hidedesc       Hide description
  *  @param      int			$hideref        Hide ref
- *  @param		HookManager	$hookmanager	Hook manager instance
  *  @return     int         				0 if KO, 1 if OK
  */
-function supplier_invoice_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
+function supplier_invoice_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
 	global $conf, $user, $langs;
 
@@ -137,7 +136,7 @@ function supplier_invoice_pdf_create($db, $object, $modele, $outputlangs, $hided
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
 		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $hookmanager) > 0)
+		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 
diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index 0813162020d..46b2e893996 100755
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -129,12 +129,11 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
      *  @param		int		$hidedetails		Do not show line details
      *  @param		int		$hidedesc			Do not show desc
      *  @param		int		$hideref			Do not show ref
-     *  @param		object	$hookmanager		Hookmanager object
      *  @return 	int             			1=OK, 0=KO
 	 */
-	function write_file($object, $outputlangs='', $srctemplatepath='', $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
+	function write_file($object, $outputlangs='', $srctemplatepath='', $hidedetails=0, $hidedesc=0, $hideref=0)
 	{
-		global $user,$langs,$conf,$mysoc;
+		global $user,$langs,$conf,$mysoc,$hookmanager;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -227,7 +226,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$pdf->AddPage();
 				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
-				$this->_pagehead($pdf, $object, 1, $outputlangs, $hookmanager);
+				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('','', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, '');		// Set interline to 3
 				$pdf->SetTextColor(0,0,0);
@@ -276,7 +275,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 					// Description of product line
 					$curX = $this->posxdesc-1;
-                    pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc,1,$hookmanager);
+                    pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc,1);
 
 					$nexY = $pdf->GetY();
                     $pageposafter=$pdf->getPage();
@@ -294,7 +293,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					// VAT Rate
                     if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
                     {
-    					$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails, $hookmanager);
+    					$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
                         $pdf->SetXY($this->posxtva, $curY);
 	       				$pdf->MultiCell($this->posxup-$this->posxtva-1, 3, $vat_rate, 0, 'R');
                     }
@@ -414,11 +413,6 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$pdf->Output($file,'F');
 
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
-				}
 				$hookmanager->initHooks(array('pdfgeneration'));
 				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
 				global $action;
@@ -824,10 +818,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
-	 *  @param	object		$hookmanager	Hookmanager object
 	 *  @return	void
 	 */
-	function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $hookmanager)
+	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $langs,$conf,$mysoc;
 
@@ -907,7 +900,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$pdf->SetTextColor(0,0,60);
 
 		// Show list of linked objects
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size, $hookmanager);
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
 
 		if ($showaddress)
 		{
diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
index e66b22a4f83..6b9fd315f18 100644
--- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
+++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
@@ -147,10 +147,9 @@ abstract class ModeleNumRefSuppliersOrders
  *  @param      int			$hidedetails    Hide details of lines
  *  @param      int			$hidedesc       Hide description
  *  @param      int			$hideref        Hide ref
- *  @param		HookManager	$hookmanager	Hook manager instance
  *  @return     int          				0 if KO, 1 if OK
  */
-function supplier_order_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false)
+function supplier_order_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0)
 {
 	global $conf, $user, $langs;
 	$langs->load("suppliers");
@@ -218,7 +217,7 @@ function supplier_order_pdf_create($db, $object, $modele, $outputlangs, $hidedet
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
 		$sav_charset_output=$outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $hookmanager) > 0)
+		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
 		{
 			$outputlangs->charset_output=$sav_charset_output;
 
diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
index 3074e73d19a..6805bb3fddb 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -138,12 +138,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
      *  @param		int		$hidedetails		Do not show line details
      *  @param		int		$hidedesc			Do not show desc
      *  @param		int		$hideref			Do not show ref
-     *  @param		object	$hookmanager		Hookmanager object
      *  @return     int             			1=OK, 0=KO
      */
-	function write_file($object,$outputlangs='',$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0,$hookmanager=false)
+	function write_file($object,$outputlangs='',$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
 	{
-		global $user,$langs,$conf;
+		global $user,$langs,$conf,$hookmanager;
 
 		if (! is_object($outputlangs)) $outputlangs=$langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
@@ -239,7 +238,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$pdf->AddPage();
 				if (! empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
-				$this->_pagehead($pdf, $object, 1, $outputlangs, $hookmanager);
+				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('','', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, '');		// Set interline to 3
 				$pdf->SetTextColor(0,0,0);
@@ -288,7 +287,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 					// Description of product line
 					$curX = $this->posxdesc-1;
-                    pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,0,0,1,$hookmanager);
+                    pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,0,0,1);
 
 					$nexY = $pdf->GetY();
                     $pageposafter=$pdf->getPage();
@@ -306,7 +305,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					// VAT Rate
                     if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
                     {
-                        $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails, $hookmanager);
+                        $vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
                         $pdf->SetXY($this->posxtva, $curY);
                         $pdf->MultiCell($this->posxup-$this->posxtva-1, 3, $vat_rate, 0, 'R');
                     }
@@ -433,11 +432,6 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 
 				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
-				}
 				$hookmanager->initHooks(array('pdfgeneration'));
 				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
 				global $action;
@@ -917,10 +911,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
-	 *  @param	object		$hookmanager	Hookmanager object
 	 *  @return	void
 	 */
-	function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $hookmanager)
+	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
 		global $langs,$conf,$mysoc;
 
@@ -1005,7 +998,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$pdf->SetTextColor(0,0,60);
 
 		// Show list of linked objects
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size, $hookmanager);
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
 
 		if ($showaddress)
 		{
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 1d34aea5d0c..90850fce683 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -1422,7 +1422,7 @@ else
                     $outputlangs->setDefaultLang($newlang);
                 }
 
-                $result=expedition_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+                $result=expedition_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
                 if ($result <= 0)
                 {
                     dol_print_error($db,$result);
diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index 86230754ef3..11e1eabd782 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -1466,7 +1466,7 @@ else if ($id > 0 || ! empty($ref))
                 $outputlangs->setDefaultLang($newlang);
             }
 
-            $result=fichinter_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+            $result=fichinter_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
             if ($result <= 0)
             {
                 dol_print_error($db,$result);
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 3e7c5600582..28eae474799 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1029,12 +1029,11 @@ class CommandeFournisseur extends CommonOrder
     /**
      *	Load an object from its id and create a new one in database
      *
-     *	@param		HookManager	$hookmanager	Hook manager instance
      *	@return		int							New id of clone
      */
-    function createFromClone($hookmanager=false)
+    function createFromClone()
     {
-        global $conf,$user,$langs;
+        global $conf,$user,$langs,$hookmanager;
 
         $error=0;
 
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index ed5c7483c64..ee802c3dc0f 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -308,7 +308,7 @@ else if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
             	}
 
                 $ret=$object->fetch($object->id);    // Reload to get new records
-                supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+                supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
             }
             unset($_POST['qty']);
             unset($_POST['type']);
@@ -367,7 +367,7 @@ else if ($action == 'updateligne' && $user->rights->fournisseur->commande->creer
         if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
         {
             $ret=$object->fetch($object->id);    // Reload to get new records
-            supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+            supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
         }
     }
     else
@@ -392,7 +392,7 @@ else if ($action == 'confirm_deleteproductline' && $confirm == 'yes' && $user->r
         if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
         {
             $ret=$object->fetch($object->id);    // Reload to get new records
-            supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+            supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
         }
     }
     else
@@ -423,7 +423,7 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->fourn
         if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
         {
             $ret=$object->fetch($object->id);    // Reload to get new records
-            supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+            supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
         }
     }
     else
@@ -522,7 +522,7 @@ else if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->fourn
 	{
 		if ($object->id > 0)
 		{
-			$result=$object->createFromClone($hookmanager);
+			$result=$object->createFromClone();
 			if ($result > 0)
 			{
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
@@ -592,7 +592,7 @@ else if ($action == 'up'	&& $user->rights->fournisseur->commande->creer)
         $outputlangs = new Translate("",$conf);
         $outputlangs->setDefaultLang($_REQUEST['lang_id']);
     }
-    if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+    if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
     header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#'.$_GET['rowid']));
     exit;
 }
@@ -606,7 +606,7 @@ else if ($action == 'down' && $user->rights->fournisseur->commande->creer)
         $outputlangs = new Translate("",$conf);
         $outputlangs->setDefaultLang($_REQUEST['lang_id']);
     }
-    if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+    if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_order_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
     header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#'.$_GET['rowid']));
     exit;
 }
@@ -628,7 +628,7 @@ else if ($action == 'builddoc' && $user->rights->fournisseur->commande->creer)	/
         $outputlangs = new Translate("",$conf);
         $outputlangs->setDefaultLang(GETPOST('lang_id'));
     }
-    $result=supplier_order_pdf_create($db, $object,$object->modelpdf,$outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+    $result=supplier_order_pdf_create($db, $object,$object->modelpdf,$outputlangs, $hidedetails, $hidedesc, $hideref);
     if ($result	<= 0)
     {
         dol_print_error($db,$result);
@@ -1797,7 +1797,7 @@ if (! empty($object->id))
 				$outputlangs->setDefaultLang($newlang);
 			}
 
-			$result=supplier_order_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+			$result=supplier_order_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			if ($result <= 0)
 			{
 				dol_print_error($db,$result);
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index abec49e0e89..fd6ffc2efe2 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -562,7 +562,7 @@ elseif ($action == 'addline')
     		$outputlangs = new Translate("",$conf);
     		$outputlangs->setDefaultLang($newlang);
     	}
-        //if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_invoice_pdf_create($db, $object->id, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+        //if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_invoice_pdf_create($db, $object->id, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
         unset($_POST['qty']);
         unset($_POST['type']);
@@ -613,7 +613,7 @@ elseif ($action == 'edit' && $user->rights->fournisseur->facture->creer)
             $outputlangs = new Translate("",$conf);
             $outputlangs->setDefaultLang($_REQUEST['lang_id']);
         }
-        //if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_invoice_pdf_create($db, $object->id, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+        //if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) supplier_invoice_pdf_create($db, $object->id, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
         $action='';
     }
@@ -839,7 +839,7 @@ elseif ($action	== 'builddoc')
         $outputlangs = new Translate("",$conf);
         $outputlangs->setDefaultLang($_REQUEST['lang_id']);
     }
-    $result=supplier_invoice_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+    $result=supplier_invoice_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
     if ($result	<= 0)
     {
         dol_print_error($db,$result);
@@ -1221,7 +1221,7 @@ if ($action == 'create')
 
         print '<table class="noborder" width="100%">';
 
-        $objectsrc->printOriginLinesList($hookmanager);
+        $objectsrc->printOriginLinesList();
 
         print '</table>';
     }
@@ -2054,7 +2054,7 @@ else
                     $outputlangs->setDefaultLang($newlang);
                 }
 
-                $result=supplier_invoice_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+                $result=supplier_invoice_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
                 if ($result <= 0)
                 {
                     dol_print_error($db,$result);
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 95c16965fb5..7cdc137d9f1 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -578,12 +578,12 @@ class Societe extends CommonObject
 	            	if (! $nosyncmember && ! empty($conf->adherent->enabled))
 	            	{
 		            	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-		            	
+
 		            	dol_syslog(get_class($this)."::update update linked member");
-		            	
+
 		            	$lmember=new Adherent($this->db);
 		            	$result=$lmember->fetch(0, 0, $this->id);
-		            	
+
 		            	if ($result > 0)
 		            	{
 		            		$lmember->firstname=$this->firstname;
@@ -604,14 +604,15 @@ class Societe extends CommonObject
 		            	{
 		            		$this->error=$lmember->error;
 		            		$error++;
-		            	}            	
+		            	}
 	            	}
             	}
-            	
+
                 // Si le fournisseur est classe on l'ajoute
                 $this->AddFournisseurInCategory($this->fournisseur_categorie);
 
                 // Actions on extra fields (by external module or standard code)
+                // FIXME le hook fait double emploi avec le trigger !!
                 $hookmanager->initHooks(array('thirdpartydao'));
                 $parameters=array('socid'=>$this->id);
                 $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
@@ -982,7 +983,8 @@ class Societe extends CommonObject
      */
     function delete($id)
     {
-        global $user,$langs,$conf;
+        global $user, $langs, $conf, $hookmanager;
+
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
@@ -1062,6 +1064,7 @@ class Societe extends CommonObject
             if (! $error)
             {
             	// Additionnal action by hooks
+            	// FIXME on a déjà un trigger, pourquoi rajouter un hook !!
                 $hookmanager->initHooks(array('thirdpartydao'));
                 $parameters=array(); $action='delete';
                 $reshook=$hookmanager->executeHooks('deleteThirdparty',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 9a9900df23e..e8cff6c4016 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -200,7 +200,7 @@ if (empty($reshook))
                 $error++; $errors[] = $langs->trans("ErrorSupplierModuleNotEnabled");
                 $action = ($action=='add'?'create':'edit');
             }
-            
+
             // We set country_id, country_code and country for the selected country
             $object->country_id=GETPOST('country_id')?GETPOST('country_id'):$mysoc->country_id;
             if ($object->country_id)
@@ -225,7 +225,7 @@ if (empty($reshook))
                 		$action = ($action=='add'?'create':'edit');
 					}
 				}
-				
+
 				$idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
 				if (! $vallabel && ! empty($conf->global->$idprof_mandatory))
 				{
@@ -236,7 +236,7 @@ if (empty($reshook))
 				}
 			}
         }
-          
+
         if (! $error)
         {
             if ($action == 'add')
@@ -395,11 +395,11 @@ if (empty($reshook))
                 }
                 // Gestion du logo de la société
 
-                
+
                 // Update linked member
                 if (! $error && $object->fk_soc > 0)
                 {
-                	
+
                 	$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
                 	$sql.= " SET fk_soc = NULL WHERE fk_soc = " . $id;
                 	dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
@@ -410,7 +410,7 @@ if (empty($reshook))
                 		dol_syslog(get_class($this)."::delete erreur -1 ".$this->error, LOG_ERR);
                 	}
                 }
-                
+
                 if (! $error && ! count($errors))
                 {
 
@@ -867,13 +867,13 @@ else
             if ($idprof!='-')
             {
                 if (($j % 2) == 0) print '<tr>';
-                
+
                 $idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
                	if(empty($conf->global->$idprof_mandatory))
                 	print '<td>'.$idprof.'</td><td>';
                 else
                 print '<td><span class="fieldrequired">'.$idprof.'</td><td>';
-                
+
                 $key='idprof'.$i;
                 print $formcompany->get_input_id_prof($i,'idprof'.$i,$object->$key,$object->country_code);
                 print '</td>';
@@ -945,7 +945,7 @@ else
         // Capital
         print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$object->capital.'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
-        // Local Taxes  
+        // Local Taxes
         //TODO: Place into a function to control showing by country or study better option
         if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1")
         {
@@ -968,7 +968,7 @@ else
             print $form->selectyesno('localtax2assuj_value',0,1);
             print '</td><tr>';
         }
-        
+
         if ($mysoc->country_code=='ES' && $mysoc->localtax2_assuj!="1" && ! empty($conf->fournisseur->enabled) && (GETPOST("type")=='f' || GETPOST("type")=='')  )
         {
         	print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
@@ -1317,13 +1317,13 @@ else
                 if ($idprof!='-')
                 {
                     if (($j % 2) == 0) print '<tr>';
-                    
+
 					$idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
 					if(empty($conf->global->$idprof_mandatory))
 						print '<td>'.$idprof.'</td><td>';
 					else
 						print '<td><span class="fieldrequired">'.$idprof.'</td><td>';
-                    
+
                     $key='idprof'.$i;
                     print $formcompany->get_input_id_prof($i,'idprof'.$i,$object->$key,$object->country_code);
                     print '</td>';
@@ -1393,7 +1393,7 @@ else
                 print $form->selectyesno('localtax2assuj_value',$object->localtax2_assuj,1);
                 print '</td></tr>';
             }
-            
+
             if ($mysoc->country_code=='ES' && $mysoc->localtax2_assuj!="1" && ! empty($conf->fournisseur->enabled) && $object->fournisseur==1)
             {
             	print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
@@ -1716,7 +1716,7 @@ else
             print yn($object->localtax2_assuj);
             print '</td><tr>';
         }
-        
+
         if ($mysoc->country_code=='ES' && $mysoc->localtax2_assuj!="1" && ! empty($conf->fournisseur->enabled) && $object->fournisseur==1)
         {
         	print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed",$mysoc->country_code).'</td><td colspan="3">';
@@ -1879,7 +1879,7 @@ else
 
             $var=true;
 
-            $somethingshown=$formfile->show_documents('company',$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$object->default_lang,$hookmanager);
+            $somethingshown=$formfile->show_documents('company',$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$object->default_lang);
 
             print '</td>';
             print '<td></td>';

From 647cbb08fbaa8113f56c8caf67eba338d653ebcb Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Sat, 26 Jan 2013 10:38:11 +0100
Subject: [PATCH 035/162] Fix: wrong EOL

---
 htdocs/categories/class/categorie.class.php | 70 ++++++++++-----------
 htdocs/core/class/hookmanager.class.php     |  2 +-
 htdocs/core/lib/trip.lib.php                | 10 +--
 htdocs/master.inc.php                       |  4 +-
 htdocs/societe/class/societe.class.php      | 66 +++++++++----------
 htdocs/societe/soc.php                      | 28 ++++-----
 6 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 802e8e3ff11..c2c249f5e41 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -543,39 +543,39 @@ class Categorie
 		return ($n[0] > 0);
 	}
 
-
-	/**
-	 * 	Load this->motherof that is array(id_son=>id_parent, ...)
-	 *
-	 *	@return		int		<0 if KO, >0 if OK
-	 */
-	private function load_motherof()
-	{
-		global $conf;
-
-		$this->motherof=array();
-
+
+	/**
+	 * 	Load this->motherof that is array(id_son=>id_parent, ...)
+	 *
+	 *	@return		int		<0 if KO, >0 if OK
+	 */
+	private function load_motherof()
+	{
+		global $conf;
+
+		$this->motherof=array();
+
 		// Load array[child]=parent
-		$sql = "SELECT fk_parent as id_parent, rowid as id_son";
-		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
-		$sql.= " WHERE fk_parent != 0";
-		$sql.= " AND entity = ".$conf->entity;
-
-		dol_syslog(get_class($this)."::load_motherof sql=".$sql);
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj= $this->db->fetch_object($resql))
-			{
-				$this->motherof[$obj->id_son]=$obj->id_parent;
-			}
-			return 1;
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -1;
-		}
+		$sql = "SELECT fk_parent as id_parent, rowid as id_son";
+		$sql.= " FROM ".MAIN_DB_PREFIX."categorie";
+		$sql.= " WHERE fk_parent != 0";
+		$sql.= " AND entity = ".$conf->entity;
+
+		dol_syslog(get_class($this)."::load_motherof sql=".$sql);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			while ($obj= $this->db->fetch_object($resql))
+			{
+				$this->motherof[$obj->id_son]=$obj->id_parent;
+			}
+			return 1;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
 	}
 
 	/**
@@ -596,8 +596,8 @@ class Categorie
 	{
 		$this->cats = array();
 
-		// Init this->motherof that is array(id_son=>id_parent, ...)
-		$this->load_motherof();
+		// Init this->motherof that is array(id_son=>id_parent, ...)
+		$this->load_motherof();
 
 		// Init $this->cats array
 		$sql = "SELECT DISTINCT c.rowid, c.label, c.description, c.fk_parent";	// Distinct reduce pb with old tables with duplicates
@@ -695,7 +695,7 @@ class Categorie
 			$i++; $cursor_categ=$this->motherof[$cursor_categ];
 		}
 		//print 'Result for id_categ='.$id_categ.' : '.$this->cats[$id_categ]['fullpath'].'<br>'."\n";
-
+
 		// We count number of _ to have level
 		$this->cats[$id_categ]['level']=dol_strlen(preg_replace('/[^_]/i','',$this->cats[$id_categ]['fullpath']));
 
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 0c31a7569fa..cca22038746 100755
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -179,7 +179,7 @@ class HookManager
                     	if (! is_array($result) && ! is_numeric($result)) $this->resPrint.=$result;
                     }
 
-                    //print "method=".$method." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." result=".$result." resaction=".$resaction;
+                    //print "method=".$method." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." result=".$result." resaction=".$resaction;
                 }
             }
         }
diff --git a/htdocs/core/lib/trip.lib.php b/htdocs/core/lib/trip.lib.php
index 309bcf33224..60794497554 100644
--- a/htdocs/core/lib/trip.lib.php
+++ b/htdocs/core/lib/trip.lib.php
@@ -50,11 +50,11 @@ function trip_prepare_head($object)
 	$head[$h][2] = 'documents';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/info.php?id=' . $object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
-	
+	$head[$h][0] = DOL_URL_ROOT . '/compta/deplacement/info.php?id=' . $object->id;
+	$head[$h][1] = $langs->trans("Info");
+	$head[$h][2] = 'info';
+	$h++;
+	
 	complete_head_from_modules($conf,$langs,$object,$head,$h,'trip','remove');
 
 	return $head;
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index b023f7110b0..41bfa6d3a91 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -207,8 +207,8 @@ if (! defined('NOREQUIRETRAN'))
 
 
 // Create the global $hookmanager object
-include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-$hookmanager=new HookManager($db);
+include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+$hookmanager=new HookManager($db);
 
 
 if (! defined('MAIN_LABEL_MENTION_NPR') ) define('MAIN_LABEL_MENTION_NPR','NPR');
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 7cdc137d9f1..269f428a61a 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -565,45 +565,45 @@ class Societe extends CommonObject
             $resql=$this->db->query($sql);
             if ($resql)
             {
-            	unset($this->country_code);		// We clean this because it may have been changed after an update of country_id
-            	unset($this->country);
-            	unset($this->state_code);
-            	unset($this->state);
-
-            	$nbrowsaffected+=$this->db->affected_rows($resql);
+            	unset($this->country_code);		// We clean this because it may have been changed after an update of country_id
+            	unset($this->country);
+            	unset($this->state_code);
+            	unset($this->state);
+
+            	$nbrowsaffected+=$this->db->affected_rows($resql);
 
             	if (! $error && $nbrowsaffected)
             	{
             		// Update information on linked member if it is an update
 	            	if (! $nosyncmember && ! empty($conf->adherent->enabled))
 	            	{
-		            	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-
-		            	dol_syslog(get_class($this)."::update update linked member");
-
-		            	$lmember=new Adherent($this->db);
-		            	$result=$lmember->fetch(0, 0, $this->id);
-
-		            	if ($result > 0)
-		            	{
-		            		$lmember->firstname=$this->firstname;
-		            		$lmember->lastname=$this->lastname;
-		            		$lmember->address=$this->address;
-		            		$lmember->email=$this->email;
-		            		$lmember->phone=$this->phone;
-
-		            		$result=$lmember->update($user,0,1,1);	// Use nosync to 1 to avoid cyclic updates
-		            		if ($result < 0)
-		            		{
-		            			$this->error=$lmember->error;
-		            			dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
-		            			$error++;
-		            		}
-		            	}
-		            	else if ($result < 0)
-		            	{
-		            		$this->error=$lmember->error;
-		            		$error++;
+		            	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+
+		            	dol_syslog(get_class($this)."::update update linked member");
+
+		            	$lmember=new Adherent($this->db);
+		            	$result=$lmember->fetch(0, 0, $this->id);
+
+		            	if ($result > 0)
+		            	{
+		            		$lmember->firstname=$this->firstname;
+		            		$lmember->lastname=$this->lastname;
+		            		$lmember->address=$this->address;
+		            		$lmember->email=$this->email;
+		            		$lmember->phone=$this->phone;
+
+		            		$result=$lmember->update($user,0,1,1);	// Use nosync to 1 to avoid cyclic updates
+		            		if ($result < 0)
+		            		{
+		            			$this->error=$lmember->error;
+		            			dol_syslog(get_class($this)."::update ".$this->error,LOG_ERR);
+		            			$error++;
+		            		}
+		            	}
+		            	else if ($result < 0)
+		            	{
+		            		$this->error=$lmember->error;
+		            		$error++;
 		            	}
 	            	}
             	}
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index e8cff6c4016..c1dd0c4c09d 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -395,21 +395,21 @@ if (empty($reshook))
                 }
                 // Gestion du logo de la société
 
-
-                // Update linked member
-                if (! $error && $object->fk_soc > 0)
+
+                // Update linked member
+                if (! $error && $object->fk_soc > 0)
                 {
-
-                	$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
-                	$sql.= " SET fk_soc = NULL WHERE fk_soc = " . $id;
-                	dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
-                	if (! $this->db->query($sql))
-                	{
-                		$error++;
-                		$this->error .= $this->db->lasterror();
-                		dol_syslog(get_class($this)."::delete erreur -1 ".$this->error, LOG_ERR);
-                	}
-                }
+
+                	$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
+                	$sql.= " SET fk_soc = NULL WHERE fk_soc = " . $id;
+                	dol_syslog(get_class($this)."::delete sql=".$sql, LOG_DEBUG);
+                	if (! $this->db->query($sql))
+                	{
+                		$error++;
+                		$this->error .= $this->db->lasterror();
+                		dol_syslog(get_class($this)."::delete erreur -1 ".$this->error, LOG_ERR);
+                	}
+                }
 
                 if (! $error && ! count($errors))
                 {

From 20023880983ece133a0ba84cff1ec5d3368027fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 26 Jan 2013 13:40:31 +0100
Subject: [PATCH 036/162] Revert "New: add hook getFormMail"

This reverts commit c7325324839e1796400eb3246873af922d964434.
---
 htdocs/core/class/html.formmail.class.php | 835 +++++++++++-----------
 1 file changed, 406 insertions(+), 429 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index c221cc33c07..3d15fdbeeee 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -217,445 +217,422 @@ class FormMail
     function get_form($addfileaction='addfile',$removefileaction='removefile')
     {
         global $conf, $langs, $user;
-        global $hookmanager;
 
         $langs->load("other");
         $langs->load("mails");
 
-        if (! is_object($hookmanager))
+        $out='';
+
+        // Define list of attached files
+        $listofpaths=array();
+        $listofnames=array();
+        $listofmimes=array();
+        if (! empty($_SESSION["listofpaths"])) $listofpaths=explode(';',$_SESSION["listofpaths"]);
+        if (! empty($_SESSION["listofnames"])) $listofnames=explode(';',$_SESSION["listofnames"]);
+        if (! empty($_SESSION["listofmimes"])) $listofmimes=explode(';',$_SESSION["listofmimes"]);
+
+
+        $form=new Form($this->db);
+
+        $out.= "\n<!-- Debut form mail -->\n";
+        if ($this->withform)
         {
-        	if (! class_exists('HookManager')) {
-        		// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-        		require DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-        		$hookmanager=new HookManager($this->db);
-        	}
+            $out.= '<form method="POST" name="mailform" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">'."\n";
+            $out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
         }
-        $hookmanager->initHooks(array('formmail'));
-
-        $parameters=array(
-        		'addfileaction' => $addfileaction,
-        		'removefileaction'=> $removefileaction
-        );
-        $reshook=$hookmanager->executeHooks('getFormMail', $parameters, $this);
-
-        if (!empty($reshook))
+        foreach ($this->param as $key=>$value)
         {
-        	return $hookmanager->resPrint;
+            $out.= '<input type="hidden" id="'.$key.'" name="'.$key.'" value="'.$value.'" />'."\n";
         }
-        else
+        $out.= '<table class="border" width="100%">'."\n";
+
+        // Substitution array
+        if (! empty($this->withsubstit))
         {
-        	$out='';
-
-        	// Define list of attached files
-        	$listofpaths=array();
-        	$listofnames=array();
-        	$listofmimes=array();
-        	if (! empty($_SESSION["listofpaths"])) $listofpaths=explode(';',$_SESSION["listofpaths"]);
-        	if (! empty($_SESSION["listofnames"])) $listofnames=explode(';',$_SESSION["listofnames"]);
-        	if (! empty($_SESSION["listofmimes"])) $listofmimes=explode(';',$_SESSION["listofmimes"]);
-
-        	$form=new Form($this->db);
-
-        	$out.= "\n<!-- Debut form mail -->\n";
-        	if ($this->withform)
-        	{
-        		$out.= '<form method="POST" name="mailform" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">'."\n";
-        		$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
-        	}
-        	foreach ($this->param as $key=>$value)
-        	{
-        		$out.= '<input type="hidden" id="'.$key.'" name="'.$key.'" value="'.$value.'" />'."\n";
-        	}
-        	$out.= '<table class="border" width="100%">'."\n";
-
-        	// Substitution array
-        	if (! empty($this->withsubstit))
-        	{
-        		$out.= '<tr><td colspan="2">';
-        		$help="";
-        		foreach($this->substit as $key => $val)
-        		{
-        			$help.=$key.' -> '.$langs->trans($val).'<br>';
-        		}
-        		$out.= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"),$help);
-        		$out.= "</td></tr>\n";
-        	}
-
-        	// From
-        	if (! empty($this->withfrom))
-        	{
-        		if (! empty($this->withfromreadonly))
-        		{
-        			$out.= '<input type="hidden" id="fromname" name="fromname" value="'.$this->fromname.'" />';
-        			$out.= '<input type="hidden" id="frommail" name="frommail" value="'.$this->frommail.'" />';
-        			$out.= '<tr><td width="180">'.$langs->trans("MailFrom").'</td><td>';
-        			if ($this->fromtype == 'user' && $this->fromid > 0)
-        			{
-        				$langs->load("users");
-        				$fuser=new User($this->db);
-        				$fuser->fetch($this->fromid);
-        				$out.= $fuser->getNomUrl(1);
-        			}
-        			else
-        			{
-        				$out.= $this->fromname;
-        			}
-        			if ($this->frommail)
-        			{
-        				$out.= " &lt;".$this->frommail."&gt;";
-        			}
-        			else
-        			{
-        				if ($this->fromtype)
-        				{
-        					$langs->load("errors");
-        					$out.= '<font class="warning"> &lt;'.$langs->trans("ErrorNoMailDefinedForThisUser").'&gt; </font>';
-        				}
-        			}
-        			$out.= "</td></tr>\n";
-        			$out.= "</td></tr>\n";
-        		}
-        		else
-        		{
-        			$out.= "<tr><td>".$langs->trans("MailFrom")."</td><td>";
-        			$out.= $langs->trans("Name").':<input type="text" id="fromname" name="fromname" size="32" value="'.$this->fromname.'" />';
-        			$out.= '&nbsp; &nbsp; ';
-        			$out.= $langs->trans("EMail").':&lt;<input type="text" id="frommail" name="frommail" size="32" value="'.$this->frommail.'" />&gt;';
-        			$out.= "</td></tr>\n";
-        		}
-        	}
-
-        	// Replyto
-        	if (! empty($this->withreplyto))
-        	{
-        		if ($this->withreplytoreadonly)
-        		{
-        			$out.= '<input type="hidden" id="replyname" name="replyname" value="'.$this->replytoname.'" />';
-        			$out.= '<input type="hidden" id="replymail" name="replymail" value="'.$this->replytomail.'" />';
-        			$out.= "<tr><td>".$langs->trans("MailReply")."</td><td>".$this->replytoname.($this->replytomail?(" &lt;".$this->replytomail."&gt;"):"");
-        			$out.= "</td></tr>\n";
-        		}
-        	}
-
-        	// Errorsto
-        	if (! empty($this->witherrorsto))
-        	{
-        		//if (! $this->errorstomail) $this->errorstomail=$this->frommail;
-        		$errorstomail = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? $conf->global->MAIN_MAIL_ERRORS_TO : $this->errorstomail);
-        		if ($this->witherrorstoreadonly)
-        		{
-        			$out.= '<input type="hidden" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
-        			$out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
-        			$out.= $errorstomail;
-        			$out.= "</td></tr>\n";
-        		}
-        		else
-        		{
-        			$out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
-        			$out.= '<input size="30" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
-        			$out.= "</td></tr>\n";
-        		}
-        	}
-
-        	// To
-        	if (! empty($this->withto) || is_array($this->withto))
-        	{
-        		$out.= '<tr><td width="180">';
-        		if ($this->withtofree) $out.= $form->textwithpicto($langs->trans("MailTo"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
-        		else $out.= $langs->trans("MailTo");
-        		$out.= '</td><td>';
-        		if ($this->withtoreadonly)
-        		{
-        			if (! empty($this->toname) && ! empty($this->tomail))
-        			{
-        				$out.= '<input type="hidden" id="toname" name="toname" value="'.$this->toname.'" />';
-        				$out.= '<input type="hidden" id="tomail" name="tomail" value="'.$this->tomail.'" />';
-        				if ($this->totype == 'thirdparty')
-        				{
-        					$soc=new Societe($this->db);
-        					$soc->fetch($this->toid);
-        					$out.= $soc->getNomUrl(1);
-        				}
-        				else if ($this->totype == 'contact')
-        				{
-        					$contact=new Contact($this->db);
-        					$contact->fetch($this->toid);
-        					$out.= $contact->getNomUrl(1);
-        				}
-        				else
-        				{
-        					$out.= $this->toname;
-        				}
-        				$out.= ' &lt;'.$this->tomail.'&gt;';
-        				if ($this->withtofree)
-        				{
-        					$out.= '<br>'.$langs->trans("or").' <input size="'.(is_array($this->withto)?"30":"60").'" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
-        				}
-        			}
-        			else
-        			{
-        				$out.= (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
-        			}
-        		}
-        		else
-        		{
-        			if (! empty($this->withtofree))
-        			{
-        				$out.= '<input size="'.(is_array($this->withto)?"30":"60").'" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
-        			}
-        			if (! empty($this->withto) && is_array($this->withto))
-        			{
-        				if (! empty($this->withtofree)) $out.= " ".$langs->trans("or")." ";
-        				$out.= $form->selectarray("receiver", $this->withto, GETPOST("receiver"), 1);
-        			}
-        			if (isset($this->withtosocid) && $this->withtosocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
-        			{
-        				$liste=array();
-        				$soc=new Societe($this->db);
-        				$soc->fetch($this->withtosocid);
-        				foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
-        				{
-        					$liste[$key]=$value;
-        				}
-        				if ($this->withtofree) $out.= " ".$langs->trans("or")." ";
-        				$out.= $form->selectarray("receiver", $liste, GETPOST("receiver"), 1);
-        			}
-        		}
-        		$out.= "</td></tr>\n";
-        	}
-
-        	// CC
-        	if (! empty($this->withtocc) || is_array($this->withtocc))
-        	{
-        		$out.= '<tr><td width="180">';
-        		$out.= $form->textwithpicto($langs->trans("MailCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
-        		$out.= '</td><td>';
-        		if ($this->withtoccreadonly)
-        		{
-        			$out.= (! is_array($this->withtocc) && ! is_numeric($this->withtocc))?$this->withtocc:"";
-        		}
-        		else
-        		{
-        			$out.= '<input size="'.(is_array($this->withtocc)?"30":"60").'" id="sendtocc" name="sendtocc" value="'.((! is_array($this->withtocc) && ! is_numeric($this->withtocc))? (isset($_POST["sendtocc"])?$_POST["sendtocc"]:$this->withtocc) : (isset($_POST["sendtocc"])?$_POST["sendtocc"]:"") ).'" />';
-        			if (! empty($this->withto) && is_array($this->withto))
-        			{
-        				$out.= " ".$langs->trans("or")." ";
-        				$out.= $form->selectarray("receivercc", $this->withto, GETPOST("receivercc"), 1);
-        			}
-        			if (! empty($this->withtoccsocid) && $this->withtoccsocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
-        			{
-        				$liste=array();
-        				$soc=new Societe($this->db);
-        				$soc->fetch($this->withtoccsocid);
-        				foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
-        				{
-        					$liste[$key]=$value;
-        				}
-        				$out.= " ".$langs->trans("or")." ";
-        				$out.= $form->selectarray("receivercc", $liste, GETPOST("receivercc"), 1);
-        			}
-        		}
-        		$out.= "</td></tr>\n";
-        	}
-
-        	// CCC
-        	if (! empty($this->withtoccc) || is_array($this->withtoccc))
-        	{
-        		$out.= '<tr><td width="180">';
-        		$out.= $form->textwithpicto($langs->trans("MailCCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
-        		$out.= '</td><td>';
-        		if (! empty($this->withtocccreadonly))
-        		{
-        			$out.= (! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))?$this->withtoccc:"";
-        		}
-        		else
-        		{
-        			$out.= '<input size="'.(is_array($this->withtoccc)?"30":"60").'" id="sendtoccc" name="sendtoccc" value="'.((! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))? (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:$this->withtoccc) : (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:"") ).'" />';
-        			if (! empty($this->withto) && is_array($this->withto))
-        			{
-        				$out.= " ".$langs->trans("or")." ";
-        				$out.= $form->selectarray("receiverccc", $this->withto, GETPOST("receiverccc"), 1);
-        			}
-        			if (! empty($this->withtocccsocid) && $this->withtocccsocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
-        			{
-        				$liste=array();
-        				$soc=new Societe($this->db);
-        				$soc->fetch($this->withtosocid);
-        				foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
-        				{
-        					$liste[$key]=$value;
-        				}
-        				$out.= " ".$langs->trans("or")." ";
-        				$out.= $form->selectarray("receiverccc", $liste, GETPOST("receiverccc"), 1);
-        			}
-        		}
-        		//if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print ' '.info_admin("+ ".$conf->global->MAIN_MAIL_AUTOCOPY_TO,1);
-        		$out.= "</td></tr>\n";
-        	}
-
-        	// Ask delivery receipt
-        	if (! empty($this->withdeliveryreceipt))
-        	{
-        		$out.= '<tr><td width="180">'.$langs->trans("DeliveryReceipt").'</td><td>';
-
-        		if (! empty($this->withdeliveryreceiptreadonly))
-        		{
-        			$out.= yn($this->withdeliveryreceipt);
-        		}
-        		else
-        		{
-        			$out.= $form->selectyesno('deliveryreceipt', (isset($_POST["deliveryreceipt"])?$_POST["deliveryreceipt"]:0), 1);
-        		}
-
-        		$out.= "</td></tr>\n";
-        	}
-
-        	// Topic
-        	if (! empty($this->withtopic))
-        	{
-        		$this->withtopic=make_substitutions($this->withtopic,$this->substit);
-
-        		$out.= '<tr>';
-        		$out.= '<td width="180">'.$langs->trans("MailTopic").'</td>';
-        		$out.= '<td>';
-        		if ($this->withtopicreadonly)
-        		{
-        			$out.= $this->withtopic;
-        			$out.= '<input type="hidden" size="60" id="subject" name="subject" value="'.$this->withtopic.'" />';
-        		}
-        		else
-        		{
-        			$out.= '<input type="text" size="60" id="subject" name="subject" value="'. (isset($_POST["subject"])?$_POST["subject"]:$this->withtopic) .'" />';
-        		}
-        		$out.= "</td></tr>\n";
-        	}
-
-        	// Attached files
-        	if (! empty($this->withfile))
-        	{
-        		$out.= '<tr>';
-        		$out.= '<td width="180">'.$langs->trans("MailFile").'</td>';
-        		$out.= '<td>';
-        		// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
-        		$out.= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
-        		$out.= '<script type="text/javascript" language="javascript">';
-        		$out.= 'jQuery(document).ready(function () {';
-        		$out.= '    jQuery(".removedfile").click(function() {';
-        		$out.= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
-        		$out.= '    });';
-        		$out.= '})';
-        		$out.= '</script>'."\n";
-        		if (count($listofpaths))
-        		{
-        			foreach($listofpaths as $key => $val)
-        			{
-        				$out.= '<div id="attachfile_'.$key.'">';
-        				$out.= img_mime($listofnames[$key]).' '.$listofnames[$key];
-        				if (! $this->withfilereadonly)
-        				{
-        					$out.= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
-        					//$out.= ' <a href="'.$_SERVER["PHP_SELF"].'?removedfile='.($key+1).' id="removedfile_'.$key.'">'.img_delete($langs->trans("Delete").'</a>';
-        				}
-        				$out.= '<br></div>';
-        			}
-        		}
-        		else
-        		{
-        			$out.= $langs->trans("NoAttachedFiles").'<br>';
-        		}
-        		if ($this->withfile == 2)	// Can add other files
-        		{
-        			$out.= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
-        			$out.= ' ';
-        			$out.= '<input type="submit" class="button" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
-        		}
-        		$out.= "</td></tr>\n";
-        	}
-
-        	// Message
-        	if (! empty($this->withbody))
-        	{
-        		$defaultmessage="";
-
-        		// TODO    A partir du type, proposer liste de messages dans table llx_models
-        		if     ($this->param["models"]=='facture_send')	            { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoice"); }
-        		elseif ($this->param["models"]=='facture_relance')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
-        		elseif ($this->param["models"]=='propal_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); }
-        		elseif ($this->param["models"]=='order_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
-        		elseif ($this->param["models"]=='order_supplier_send')		{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
-        		elseif ($this->param["models"]=='invoice_supplier_send')	{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
-        		elseif ($this->param["models"]=='shipping_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendShipping"); }
-        		elseif ($this->param["models"]=='fichinter_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendFichInter"); }
-        		elseif (! is_numeric($this->withbody))                      { $defaultmessage=$this->withbody; }
-
-        		// Complete substitution array
-        		if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_ADD_PAYMENT_URL))
-        		{
-        			require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
-
-        			$langs->load('paypal');
-
-        			if ($this->param["models"]=='order_send')
-        			{
-        				$url=getPaypalPaymentUrl(0,'order',$this->substit['__ORDERREF__']);
-        				$this->substit['__PERSONALIZED__']=$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url);
-        			}
-        			if ($this->param["models"]=='facture_send')
-        			{
-        				$url=getPaypalPaymentUrl(0,'invoice',$this->substit['__FACREF__']);
-        				$this->substit['__PERSONALIZED__']=$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url);
-        			}
-        		}
-
-        		$defaultmessage=make_substitutions($defaultmessage,$this->substit);
-        		if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
-        		$defaultmessage=str_replace('\n',"\n",$defaultmessage);
-
-        		$out.= '<tr>';
-        		$out.= '<td width="180" valign="top">'.$langs->trans("MailText").'</td>';
-        		$out.= '<td>';
-        		if ($this->withbodyreadonly)
-        		{
-        			$out.= nl2br($defaultmessage);
-        			$out.= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />';
-        		}
-        		else
-        		{
-        			if (! isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes';
-
-        			// Editor wysiwyg
-        			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-        			$doleditor=new DolEditor('message',$defaultmessage,'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,72);
-        			$out.= $doleditor->Create(1);
-        		}
-        		$out.= "</td></tr>\n";
-        	}
-
-        	if (! empty($this->withform))
-        	{
-        		$out.= '<tr><td align="center" colspan="2"><center>';
-        		$out.= '<input class="button" type="submit" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"';
-        		// Add a javascript test to avoid to forget to submit file before sending email
-        		if ($this->withfile == 2 && $conf->use_javascript_ajax)
-        		{
-        			$out.= ' onClick="if (document.mailform.addedfile.value != \'\') { alert(\''.dol_escape_js($langs->trans("FileWasNotUploaded")).'\'); return false; } else { return true; }"';
-        		}
-        		$out.= ' />';
-        		if ($this->withcancel)
-        		{
-        			$out.= ' &nbsp; &nbsp; ';
-        			$out.= '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'" />';
-        		}
-        		$out.= '</center></td></tr>'."\n";
-        	}
-
-        	$out.= '</table>'."\n";
-
-        	if (! empty($this->withform)) $out.= '</form>'."\n";
-        	$out.= "<!-- Fin form mail -->\n";
-
-        	return $out;
+            $out.= '<tr><td colspan="2">';
+            $help="";
+            foreach($this->substit as $key => $val)
+            {
+                $help.=$key.' -> '.$langs->trans($val).'<br>';
+            }
+            $out.= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"),$help);
+            $out.= "</td></tr>\n";
         }
+
+        // From
+        if (! empty($this->withfrom))
+        {
+            if (! empty($this->withfromreadonly))
+            {
+                $out.= '<input type="hidden" id="fromname" name="fromname" value="'.$this->fromname.'" />';
+                $out.= '<input type="hidden" id="frommail" name="frommail" value="'.$this->frommail.'" />';
+                $out.= '<tr><td width="180">'.$langs->trans("MailFrom").'</td><td>';
+                if ($this->fromtype == 'user' && $this->fromid > 0)
+                {
+                    $langs->load("users");
+                    $fuser=new User($this->db);
+                    $fuser->fetch($this->fromid);
+                    $out.= $fuser->getNomUrl(1);
+                }
+                else
+                {
+                    $out.= $this->fromname;
+                }
+                if ($this->frommail)
+                {
+                    $out.= " &lt;".$this->frommail."&gt;";
+                }
+                else
+                {
+                    if ($this->fromtype)
+                    {
+                        $langs->load("errors");
+                        $out.= '<font class="warning"> &lt;'.$langs->trans("ErrorNoMailDefinedForThisUser").'&gt; </font>';
+                    }
+                }
+                $out.= "</td></tr>\n";
+                $out.= "</td></tr>\n";
+            }
+            else
+            {
+                $out.= "<tr><td>".$langs->trans("MailFrom")."</td><td>";
+                $out.= $langs->trans("Name").':<input type="text" id="fromname" name="fromname" size="32" value="'.$this->fromname.'" />';
+                $out.= '&nbsp; &nbsp; ';
+                $out.= $langs->trans("EMail").':&lt;<input type="text" id="frommail" name="frommail" size="32" value="'.$this->frommail.'" />&gt;';
+                $out.= "</td></tr>\n";
+            }
+        }
+
+        // Replyto
+        if (! empty($this->withreplyto))
+        {
+            if ($this->withreplytoreadonly)
+            {
+                $out.= '<input type="hidden" id="replyname" name="replyname" value="'.$this->replytoname.'" />';
+                $out.= '<input type="hidden" id="replymail" name="replymail" value="'.$this->replytomail.'" />';
+                $out.= "<tr><td>".$langs->trans("MailReply")."</td><td>".$this->replytoname.($this->replytomail?(" &lt;".$this->replytomail."&gt;"):"");
+                $out.= "</td></tr>\n";
+            }
+        }
+
+        // Errorsto
+        if (! empty($this->witherrorsto))
+        {
+            //if (! $this->errorstomail) $this->errorstomail=$this->frommail;
+            $errorstomail = (! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? $conf->global->MAIN_MAIL_ERRORS_TO : $this->errorstomail);
+            if ($this->witherrorstoreadonly)
+            {
+                $out.= '<input type="hidden" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
+                $out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
+                $out.= $errorstomail;
+                $out.= "</td></tr>\n";
+            }
+            else
+            {
+                $out.= '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
+                $out.= '<input size="30" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
+                $out.= "</td></tr>\n";
+            }
+        }
+
+        // To
+        if (! empty($this->withto) || is_array($this->withto))
+        {
+            $out.= '<tr><td width="180">';
+            if ($this->withtofree) $out.= $form->textwithpicto($langs->trans("MailTo"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+            else $out.= $langs->trans("MailTo");
+            $out.= '</td><td>';
+            if ($this->withtoreadonly)
+            {
+                if (! empty($this->toname) && ! empty($this->tomail))
+                {
+                    $out.= '<input type="hidden" id="toname" name="toname" value="'.$this->toname.'" />';
+                    $out.= '<input type="hidden" id="tomail" name="tomail" value="'.$this->tomail.'" />';
+                    if ($this->totype == 'thirdparty')
+                    {
+                        $soc=new Societe($this->db);
+                        $soc->fetch($this->toid);
+                        $out.= $soc->getNomUrl(1);
+                    }
+                    else if ($this->totype == 'contact')
+                    {
+                        $contact=new Contact($this->db);
+                        $contact->fetch($this->toid);
+                        $out.= $contact->getNomUrl(1);
+                    }
+                    else
+                    {
+                        $out.= $this->toname;
+                    }
+                    $out.= ' &lt;'.$this->tomail.'&gt;';
+                    if ($this->withtofree)
+                    {
+                        $out.= '<br>'.$langs->trans("or").' <input size="'.(is_array($this->withto)?"30":"60").'" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
+                    }
+                }
+                else
+                {
+                    $out.= (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
+                }
+            }
+            else
+            {
+                if (! empty($this->withtofree))
+                {
+                    $out.= '<input size="'.(is_array($this->withto)?"30":"60").'" id="sendto" name="sendto" value="'.(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_REQUEST["sendto"])?$_REQUEST["sendto"]:$this->withto) :"").'" />';
+                }
+                if (! empty($this->withto) && is_array($this->withto))
+                {
+                    if (! empty($this->withtofree)) $out.= " ".$langs->trans("or")." ";
+                    $out.= $form->selectarray("receiver", $this->withto, GETPOST("receiver"), 1);
+                }
+                if (isset($this->withtosocid) && $this->withtosocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
+                {
+                    $liste=array();
+                    $soc=new Societe($this->db);
+                    $soc->fetch($this->withtosocid);
+                    foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
+                    {
+                        $liste[$key]=$value;
+                    }
+                    if ($this->withtofree) $out.= " ".$langs->trans("or")." ";
+                    $out.= $form->selectarray("receiver", $liste, GETPOST("receiver"), 1);
+                }
+            }
+            $out.= "</td></tr>\n";
+        }
+
+        // CC
+        if (! empty($this->withtocc) || is_array($this->withtocc))
+        {
+            $out.= '<tr><td width="180">';
+            $out.= $form->textwithpicto($langs->trans("MailCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+            $out.= '</td><td>';
+            if ($this->withtoccreadonly)
+            {
+                $out.= (! is_array($this->withtocc) && ! is_numeric($this->withtocc))?$this->withtocc:"";
+            }
+            else
+            {
+                $out.= '<input size="'.(is_array($this->withtocc)?"30":"60").'" id="sendtocc" name="sendtocc" value="'.((! is_array($this->withtocc) && ! is_numeric($this->withtocc))? (isset($_POST["sendtocc"])?$_POST["sendtocc"]:$this->withtocc) : (isset($_POST["sendtocc"])?$_POST["sendtocc"]:"") ).'" />';
+                if (! empty($this->withto) && is_array($this->withto))
+                {
+                    $out.= " ".$langs->trans("or")." ";
+                    $out.= $form->selectarray("receivercc", $this->withto, GETPOST("receivercc"), 1);
+                }
+                if (! empty($this->withtoccsocid) && $this->withtoccsocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
+                {
+                    $liste=array();
+                    $soc=new Societe($this->db);
+                    $soc->fetch($this->withtoccsocid);
+                    foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
+                    {
+                        $liste[$key]=$value;
+                    }
+                    $out.= " ".$langs->trans("or")." ";
+                    $out.= $form->selectarray("receivercc", $liste, GETPOST("receivercc"), 1);
+                }
+            }
+            $out.= "</td></tr>\n";
+        }
+
+        // CCC
+        if (! empty($this->withtoccc) || is_array($this->withtoccc))
+        {
+            $out.= '<tr><td width="180">';
+            $out.= $form->textwithpicto($langs->trans("MailCCC"),$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"));
+            $out.= '</td><td>';
+            if (! empty($this->withtocccreadonly))
+            {
+                $out.= (! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))?$this->withtoccc:"";
+            }
+            else
+            {
+                $out.= '<input size="'.(is_array($this->withtoccc)?"30":"60").'" id="sendtoccc" name="sendtoccc" value="'.((! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))? (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:$this->withtoccc) : (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:"") ).'" />';
+                if (! empty($this->withto) && is_array($this->withto))
+                {
+                    $out.= " ".$langs->trans("or")." ";
+                    $out.= $form->selectarray("receiverccc", $this->withto, GETPOST("receiverccc"), 1);
+                }
+                if (! empty($this->withtocccsocid) && $this->withtocccsocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
+                {
+                    $liste=array();
+                    $soc=new Societe($this->db);
+                    $soc->fetch($this->withtosocid);
+                    foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
+                    {
+                        $liste[$key]=$value;
+                    }
+                    $out.= " ".$langs->trans("or")." ";
+                    $out.= $form->selectarray("receiverccc", $liste, GETPOST("receiverccc"), 1);
+                }
+            }
+            //if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print ' '.info_admin("+ ".$conf->global->MAIN_MAIL_AUTOCOPY_TO,1);
+            $out.= "</td></tr>\n";
+        }
+
+        // Ask delivery receipt
+        if (! empty($this->withdeliveryreceipt))
+        {
+            $out.= '<tr><td width="180">'.$langs->trans("DeliveryReceipt").'</td><td>';
+
+            if (! empty($this->withdeliveryreceiptreadonly))
+            {
+                $out.= yn($this->withdeliveryreceipt);
+            }
+            else
+            {
+                $out.= $form->selectyesno('deliveryreceipt', (isset($_POST["deliveryreceipt"])?$_POST["deliveryreceipt"]:0), 1);
+            }
+
+            $out.= "</td></tr>\n";
+        }
+
+        // Topic
+        if (! empty($this->withtopic))
+        {
+            $this->withtopic=make_substitutions($this->withtopic,$this->substit);
+
+            $out.= '<tr>';
+            $out.= '<td width="180">'.$langs->trans("MailTopic").'</td>';
+            $out.= '<td>';
+            if ($this->withtopicreadonly)
+            {
+                $out.= $this->withtopic;
+                $out.= '<input type="hidden" size="60" id="subject" name="subject" value="'.$this->withtopic.'" />';
+            }
+            else
+            {
+                $out.= '<input type="text" size="60" id="subject" name="subject" value="'. (isset($_POST["subject"])?$_POST["subject"]:$this->withtopic) .'" />';
+            }
+            $out.= "</td></tr>\n";
+        }
+
+        // Attached files
+        if (! empty($this->withfile))
+        {
+            $out.= '<tr>';
+            $out.= '<td width="180">'.$langs->trans("MailFile").'</td>';
+            $out.= '<td>';
+            // TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
+            $out.= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
+            $out.= '<script type="text/javascript" language="javascript">';
+            $out.= 'jQuery(document).ready(function () {';
+            $out.= '    jQuery(".removedfile").click(function() {';
+            $out.= '        jQuery(".removedfilehidden").val(jQuery(this).val());';
+            $out.= '    });';
+            $out.= '})';
+            $out.= '</script>'."\n";
+            if (count($listofpaths))
+            {
+                foreach($listofpaths as $key => $val)
+                {
+                    $out.= '<div id="attachfile_'.$key.'">';
+                    $out.= img_mime($listofnames[$key]).' '.$listofnames[$key];
+                    if (! $this->withfilereadonly)
+                    {
+                        $out.= ' <input type="image" style="border: 0px;" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/delete.png" value="'.($key+1).'" class="removedfile" id="removedfile_'.$key.'" name="removedfile_'.$key.'" />';
+                        //$out.= ' <a href="'.$_SERVER["PHP_SELF"].'?removedfile='.($key+1).' id="removedfile_'.$key.'">'.img_delete($langs->trans("Delete").'</a>';
+                    }
+                    $out.= '<br></div>';
+                }
+            }
+            else
+            {
+                $out.= $langs->trans("NoAttachedFiles").'<br>';
+            }
+            if ($this->withfile == 2)	// Can add other files
+            {
+                $out.= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
+                $out.= ' ';
+                $out.= '<input type="submit" class="button" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
+            }
+            $out.= "</td></tr>\n";
+        }
+
+        // Message
+        if (! empty($this->withbody))
+        {
+            $defaultmessage="";
+
+            // TODO    A partir du type, proposer liste de messages dans table llx_models
+            if     ($this->param["models"]=='facture_send')	            { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoice"); }
+            elseif ($this->param["models"]=='facture_relance')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendInvoiceReminder"); }
+            elseif ($this->param["models"]=='propal_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendProposal"); }
+            elseif ($this->param["models"]=='order_send')				{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
+            elseif ($this->param["models"]=='order_supplier_send')		{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierOrder"); }
+            elseif ($this->param["models"]=='invoice_supplier_send')	{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
+            elseif ($this->param["models"]=='shipping_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendShipping"); }
+            elseif ($this->param["models"]=='fichinter_send')			{ $defaultmessage=$langs->transnoentities("PredefinedMailContentSendFichInter"); }
+            elseif (! is_numeric($this->withbody))                      { $defaultmessage=$this->withbody; }
+
+            // Complete substitution array
+            if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_ADD_PAYMENT_URL))
+            {
+                require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
+
+                $langs->load('paypal');
+
+                if ($this->param["models"]=='order_send')
+                {
+                    $url=getPaypalPaymentUrl(0,'order',$this->substit['__ORDERREF__']);
+                    $this->substit['__PERSONALIZED__']=$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url);
+                }
+                if ($this->param["models"]=='facture_send')
+                {
+                    $url=getPaypalPaymentUrl(0,'invoice',$this->substit['__FACREF__']);
+                    $this->substit['__PERSONALIZED__']=$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url);
+                }
+            }
+
+            $defaultmessage=make_substitutions($defaultmessage,$this->substit);
+            if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
+            $defaultmessage=str_replace('\n',"\n",$defaultmessage);
+
+            $out.= '<tr>';
+            $out.= '<td width="180" valign="top">'.$langs->trans("MailText").'</td>';
+            $out.= '<td>';
+            if ($this->withbodyreadonly)
+            {
+                $out.= nl2br($defaultmessage);
+                $out.= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />';
+            }
+            else
+            {
+            	if (! isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes';
+
+                // Editor wysiwyg
+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+                $doleditor=new DolEditor('message',$defaultmessage,'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,72);
+                $out.= $doleditor->Create(1);
+            }
+            $out.= "</td></tr>\n";
+        }
+
+        if (! empty($this->withform))
+        {
+            $out.= '<tr><td align="center" colspan="2"><center>';
+            $out.= '<input class="button" type="submit" id="sendmail" name="sendmail" value="'.$langs->trans("SendMail").'"';
+            // Add a javascript test to avoid to forget to submit file before sending email
+            if ($this->withfile == 2 && $conf->use_javascript_ajax)
+            {
+                $out.= ' onClick="if (document.mailform.addedfile.value != \'\') { alert(\''.dol_escape_js($langs->trans("FileWasNotUploaded")).'\'); return false; } else { return true; }"';
+            }
+            $out.= ' />';
+            if ($this->withcancel)
+            {
+                $out.= ' &nbsp; &nbsp; ';
+                $out.= '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'" />';
+            }
+            $out.= '</center></td></tr>'."\n";
+        }
+
+        $out.= '</table>'."\n";
+
+        if (! empty($this->withform)) $out.= '</form>'."\n";
+        $out.= "<!-- Fin form mail -->\n";
+
+        return $out;
     }
 }
 

From dde873899974f9fb473f10b93ede74587dbc08fb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Jan 2013 11:30:28 +0100
Subject: [PATCH 037/162] Qual: Add a protection to detect bad usage of
 getStaticMember

---
 htdocs/core/lib/functions.lib.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3a17c270544..fa0a1c22619 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -51,15 +51,18 @@ function getStaticMember($class, $member)
 	$classObj = new ReflectionClass($class);
 	$result = null;
 
+	$found=0;
 	foreach($classObj->getStaticProperties() as $prop => $value)
 	{
-		if($prop == $member)
+		if ($prop == $member)
 		{
 			$result = $value;
+			$found++;
 			break;
 		}
 	}
 
+	if (! $found) dol_print_error('','Try to get a static member "'.$member.'" in class "'.$class.'" that does not exists or is not static.');
 	return $result;
 }
 
@@ -2122,7 +2125,7 @@ function dol_print_error($db='',$error='')
 		$out.="<br>\n";
 		$out.="<b>".$langs->trans("RequestedUrl").":</b> ".$_SERVER["REQUEST_URI"]."<br>\n";;
 		$out.="<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"])?$_SERVER["HTTP_REFERER"]:'')."<br>\n";;
-		$out.="<b>".$langs->trans("MenuManager").":</b> ".$conf->standard_menu."<br>\n";
+		$out.="<b>".$langs->trans("MenuManager").":</b> ".(isset($conf->standard_menu)?$conf->standard_menu:'')."<br>\n";
 		$out.="<br>\n";
 		$syslog.="url=".$_SERVER["REQUEST_URI"];
 		$syslog.=", query_string=".$_SERVER["QUERY_STRING"];

From 1b8634588f1ec7ca32b155732e0543fbfd68767c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Jan 2013 11:31:44 +0100
Subject: [PATCH 038/162] Fix: Missing property

---
 htdocs/core/db/pgsql.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 695ab573fc4..ecb17b8a9f0 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -41,7 +41,9 @@ class DoliDBPgsql
     //! Database label
 	static $label='PostgreSQL';      // Label of manager
 	//! Charset
-	var $forcecharset='UTF8';      // Can't be static as it may be forced with a dynamic value
+	var $forcecharset='UTF8';       // Can't be static as it may be forced with a dynamic value
+    //! Collate used to force collate when creating database
+    var $forcecollate='';			// Can't be static as it may be forced with a dynamic value
 	//! Version min database
 	static $versionmin=array(8,4,0);	// Version min database
 

From eeba48f9b094fde9e93ae9739f5b108b0ad04afc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Jan 2013 11:43:49 +0100
Subject: [PATCH 039/162] Fix: Log not reported Fix: charset not correctly
 forced

---
 htdocs/install/etape1.php | 11 +++++++----
 htdocs/install/inc.php    | 22 +++++++++++++++++++++-
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index 32717e18b80..009d953e73d 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -255,8 +255,10 @@ if (! $error && $db->connected)
 {
     if (! empty($_POST["db_create_database"]))	// If we create database, we force default value
     {
-    	$defaultCharacterSet=getStaticMember(get_class($db),'forcecharset');
-    	$defaultDBSortingCollation=getStaticMember(get_class($db),'forcecollate');
+    	//$defaultCharacterSet=getStaticMember(get_class($db),'forcecharset');
+    	//$defaultDBSortingCollation=getStaticMember(get_class($db),'forcecollate');
+    	$defaultCharacterSet=$db->forcecharset;
+    	$defaultDBSortingCollation=$db->forcecollate;
     }
     else	// If already created, we take current value
     {
@@ -268,6 +270,7 @@ if (! $error && $db->connected)
     print '<input type="hidden" name="dolibarr_main_db_collation" value="'.$defaultDBSortingCollation.'">';
     $db_character_set=$defaultCharacterSet;
     $db_collation=$defaultDBSortingCollation;
+    dolibarr_install_syslog("db_character_set=".$db_character_set." db_collation=".$db_collation);
 }
 
 
@@ -559,8 +562,8 @@ if (! $error && $db->connected && $action == "set")
         // If database creation is asked, we create it
         if (! $error && (isset($_POST["db_create_database"]) && $_POST["db_create_database"] == "on"))
         {
-            dolibarr_install_syslog("etape1: Create database : ".$dolibarr_main_db_name, LOG_DEBUG);
-            $newdb=getDoliDBInstance($conf->db->type,$conf->db->host,$userroot,$passroot,'',$conf->db->port);
+        	dolibarr_install_syslog("etape1: Create database : ".$dolibarr_main_db_name." ".$dolibarr_main_db_character_set." ".$dolibarr_main_db_collation." ".$dolibarr_main_db_user, LOG_DEBUG);
+        	$newdb=getDoliDBInstance($conf->db->type,$conf->db->host,$userroot,$passroot,'',$conf->db->port);
             //print 'eee'.$conf->db->type." ".$conf->db->host." ".$userroot." ".$passroot." ".$conf->db->port." ".$newdb->connected." ".$newdb->forcecharset;exit;
 
             if ($newdb->connected)
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 9e8565402d2..866bb471d78 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -200,6 +200,7 @@ if (constant('DOL_DATA_ROOT') && file_exists($lockfile))
 // Force usage of log file for install and upgrades
 $conf->syslog->enabled=1;
 $conf->global->SYSLOG_LEVEL=constant('LOG_DEBUG');
+if (! defined('SYSLOG_HANDLERS')) define('SYSLOG_HANDLERS','["mod_syslog_file"]');
 if (! defined('SYSLOG_FILE'))	// To avoid warning on systems with constant already defined
 {
 	if (@is_writable('/tmp')) define('SYSLOG_FILE','/tmp/dolibarr_install.log');
@@ -314,7 +315,26 @@ function conf($dolibarr_main_document_root)
         //print 'SYSLOG_FILE='.SYSLOG_FILE;exit;
     }
     if (! defined('SYSLOG_FILE_NO_ERROR')) define('SYSLOG_FILE_NO_ERROR',1);
-
+    // We init log handler for install
+    $handlers = array('mod_syslog_file');
+    foreach ($handlers as $handler)
+    {
+    	$file = DOL_DOCUMENT_ROOT.'/core/modules/syslog/'.$handler.'.php';
+    	if (!file_exists($file))
+    	{
+    		throw new Exception('Missing log handler file '.$handler.'.php');
+    	}
+    
+    	require_once $file;
+    	$loghandlerinstance = new $handler();
+    	if (!$loghandlerinstance instanceof LogHandlerInterface)
+    	{
+    		throw new Exception('Log handler does not extend LogHandlerInterface');
+    	}
+    
+    	$conf->loghandlers[]=$loghandlerinstance;
+    }
+    
     return 1;
 }
 

From abd8aea06b97f8eb3839c00fb5370da5b41a032d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Jan 2013 11:56:45 +0100
Subject: [PATCH 040/162] Fix: Log not reported Fix: charset not correctly
 forced

Conflicts:
	htdocs/install/inc.php
---
 htdocs/install/etape1.php | 11 +++++++----
 htdocs/install/inc.php    | 23 +++++++++++++++++++++--
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index 32717e18b80..009d953e73d 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -255,8 +255,10 @@ if (! $error && $db->connected)
 {
     if (! empty($_POST["db_create_database"]))	// If we create database, we force default value
     {
-    	$defaultCharacterSet=getStaticMember(get_class($db),'forcecharset');
-    	$defaultDBSortingCollation=getStaticMember(get_class($db),'forcecollate');
+    	//$defaultCharacterSet=getStaticMember(get_class($db),'forcecharset');
+    	//$defaultDBSortingCollation=getStaticMember(get_class($db),'forcecollate');
+    	$defaultCharacterSet=$db->forcecharset;
+    	$defaultDBSortingCollation=$db->forcecollate;
     }
     else	// If already created, we take current value
     {
@@ -268,6 +270,7 @@ if (! $error && $db->connected)
     print '<input type="hidden" name="dolibarr_main_db_collation" value="'.$defaultDBSortingCollation.'">';
     $db_character_set=$defaultCharacterSet;
     $db_collation=$defaultDBSortingCollation;
+    dolibarr_install_syslog("db_character_set=".$db_character_set." db_collation=".$db_collation);
 }
 
 
@@ -559,8 +562,8 @@ if (! $error && $db->connected && $action == "set")
         // If database creation is asked, we create it
         if (! $error && (isset($_POST["db_create_database"]) && $_POST["db_create_database"] == "on"))
         {
-            dolibarr_install_syslog("etape1: Create database : ".$dolibarr_main_db_name, LOG_DEBUG);
-            $newdb=getDoliDBInstance($conf->db->type,$conf->db->host,$userroot,$passroot,'',$conf->db->port);
+        	dolibarr_install_syslog("etape1: Create database : ".$dolibarr_main_db_name." ".$dolibarr_main_db_character_set." ".$dolibarr_main_db_collation." ".$dolibarr_main_db_user, LOG_DEBUG);
+        	$newdb=getDoliDBInstance($conf->db->type,$conf->db->host,$userroot,$passroot,'',$conf->db->port);
             //print 'eee'.$conf->db->type." ".$conf->db->host." ".$userroot." ".$passroot." ".$conf->db->port." ".$newdb->connected." ".$newdb->forcecharset;exit;
 
             if ($newdb->connected)
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 354ad1e8cbe..f078f7a1802 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -200,6 +200,7 @@ if (constant('DOL_DATA_ROOT') && file_exists($lockfile))
 // Force usage of log file for install and upgrades
 $conf->syslog->enabled=1;
 $conf->global->SYSLOG_LEVEL=constant('LOG_DEBUG');
+if (! defined('SYSLOG_HANDLERS')) define('SYSLOG_HANDLERS','["mod_syslog_file"]');
 if (! defined('SYSLOG_FILE'))	// To avoid warning on systems with constant already defined
 {
 	if (@is_writable('/tmp')) define('SYSLOG_FILE','/tmp/dolibarr_install.log');
@@ -230,7 +231,6 @@ foreach ($handlers as $handler)
 	$conf->loghandlers[]=$loghandlerinstance;
 }
 
-
 // Removed magic_quotes
 if (function_exists('get_magic_quotes_gpc'))	// magic_quotes_* removed in PHP 5.4
 {
@@ -314,7 +314,26 @@ function conf($dolibarr_main_document_root)
         //print 'SYSLOG_FILE='.SYSLOG_FILE;exit;
     }
     if (! defined('SYSLOG_FILE_NO_ERROR')) define('SYSLOG_FILE_NO_ERROR',1);
-
+    // We init log handler for install
+    $handlers = array('mod_syslog_file');
+    foreach ($handlers as $handler)
+    {
+    	$file = DOL_DOCUMENT_ROOT.'/core/modules/syslog/'.$handler.'.php';
+    	if (!file_exists($file))
+    	{
+    		throw new Exception('Missing log handler file '.$handler.'.php');
+    	}
+    
+    	require_once $file;
+    	$loghandlerinstance = new $handler();
+    	if (!$loghandlerinstance instanceof LogHandlerInterface)
+    	{
+    		throw new Exception('Log handler does not extend LogHandlerInterface');
+    	}
+    
+    	$conf->loghandlers[]=$loghandlerinstance;
+    }
+    
     return 1;
 }
 

From b98151db9463ed9145748c81e522ac5392bdd30c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Jan 2013 12:22:12 +0100
Subject: [PATCH 041/162] Fix: A log handler can be loaded twice.

---
 htdocs/core/class/conf.class.php | 2 +-
 htdocs/install/etape5.php        | 4 ++++
 htdocs/install/inc.php           | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 75414d8f109..500d215ef44 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -454,7 +454,7 @@ class Conf
         		throw new Exception('Log handler does not extend LogHandlerInterface');
         	}
 
-        	$this->loghandlers[]=$loghandlerinstance;
+        	$this->loghandlers[$handler]=$loghandlerinstance;
         }
 	}
 }
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index 4f7803c9786..1fb4f45e80f 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -142,6 +142,10 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i',$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);
+        
     $ok = 0;
 
     // If first install
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 866bb471d78..18648ab8680 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -228,7 +228,7 @@ foreach ($handlers as $handler)
 		throw new Exception('Log handler does not extend LogHandlerInterface');
 	}
 
-	$conf->loghandlers[]=$loghandlerinstance;
+	if (empty($conf->loghandlers[$handler])) $conf->loghandlers[$handler]=$loghandlerinstance;
 }
 
 
@@ -331,8 +331,8 @@ function conf($dolibarr_main_document_root)
     	{
     		throw new Exception('Log handler does not extend LogHandlerInterface');
     	}
-    
-    	$conf->loghandlers[]=$loghandlerinstance;
+
+		if (empty($conf->loghandlers[$handler])) $conf->loghandlers[$handler]=$loghandlerinstance;
     }
     
     return 1;

From db38c9baac84145c09068443e0eae35d72dfd3f3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Jan 2013 12:35:29 +0100
Subject: [PATCH 042/162] Fix: loghandler loaded twice

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

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 500d215ef44..685dfa93b9a 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -454,7 +454,7 @@ class Conf
         		throw new Exception('Log handler does not extend LogHandlerInterface');
         	}
 
-        	$this->loghandlers[$handler]=$loghandlerinstance;
+        	if (empty($conf->loghandlers[$handler])) $this->loghandlers[$handler]=$loghandlerinstance;
         }
 	}
 }

From a8ccc0ab0b0cd3b3ec716f96b74ceef5db9ec2a0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Jan 2013 12:36:15 +0100
Subject: [PATCH 043/162] Fix: loghandler loaded twice.

---
 htdocs/core/class/conf.class.php | 2 +-
 htdocs/install/inc.php           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 2d9fb472407..e456effe66e 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -466,7 +466,7 @@ class Conf
         		throw new Exception('Log handler does not extend LogHandlerInterface');
         	}
 
-        	$this->loghandlers[]=$loghandlerinstance;
+        	if (empty($conf->loghandlers[$handler])) $this->loghandlers[$handler]=$loghandlerinstance;
         }
 	}
 }
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index f078f7a1802..12c58371b29 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -228,7 +228,7 @@ foreach ($handlers as $handler)
 		throw new Exception('Log handler does not extend LogHandlerInterface');
 	}
 
-	$conf->loghandlers[]=$loghandlerinstance;
+	if (empty($conf->loghandlers[$handler])) $conf->loghandlers[$handler]=$loghandlerinstance;
 }
 
 // Removed magic_quotes
@@ -331,7 +331,7 @@ function conf($dolibarr_main_document_root)
     		throw new Exception('Log handler does not extend LogHandlerInterface');
     	}
     
-    	$conf->loghandlers[]=$loghandlerinstance;
+    	if (empty($conf->loghandlers[$handler])) $conf->loghandlers[$handler]=$loghandlerinstance;
     }
     
     return 1;

From ac3ccade985387beca8e7f7c1b2cf6bb9d71a79a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Jan 2013 13:11:12 +0100
Subject: [PATCH 044/162] Fix: number of chars to low to show value.

---
 htdocs/core/modules/syslog/mod_syslog_file.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index b00fa11945a..b0e1bd550b4 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -138,7 +138,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 				LOG_DEBUG => 'DEBUG'
 			);
 
-			$message = dol_print_date(time(),"%Y-%m-%d %H:%M:%S")." ".sprintf("%-5s", $logLevels[$content['level']])." ".sprintf("%-15s", $content['ip'])." ".($this->ident>0?str_pad('',$this->ident,' '):'').$content['message'];
+			$message = dol_print_date(time(),"%Y-%m-%d %H:%M:%S")." ".sprintf("%-7s", $logLevels[$content['level']])." ".sprintf("%-15s", $content['ip'])." ".($this->ident>0?str_pad('',$this->ident,' '):'').$content['message'];
 
 			fwrite($filefd, $message."\n");
 			fclose($filefd);

From c42a0c5b035d40a74a804fcf6c757f9107984e61 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Jan 2013 14:40:15 +0100
Subject: [PATCH 045/162] Fix: removed warning

---
 htdocs/admin/company.php                |  6 ++---
 htdocs/core/menus/standard/eldy.lib.php | 16 +++++------
 htdocs/main.inc.php                     |  2 +-
 htdocs/societe/class/societe.class.php  | 35 +++++++++++++------------
 4 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index bc61dad4aed..28336d2966a 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -646,13 +646,13 @@ else
     print '</td></tr>';
 
     $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("CompanyAddress").'</td><td>' . nl2br($conf->global->MAIN_INFO_SOCIETE_ADRESSE) . '</td></tr>';
+    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("CompanyAddress").'</td><td>' . nl2br(empty($conf->global->MAIN_INFO_SOCIETE_ADRESSE)?'':$conf->global->MAIN_INFO_SOCIETE_ADRESSE) . '</td></tr>';
 
     $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("CompanyZip").'</td><td>' . $conf->global->MAIN_INFO_SOCIETE_CP . '</td></tr>';
+    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("CompanyZip").'</td><td>' . (empty($conf->global->MAIN_INFO_SOCIETE_CP)?'':$conf->global->MAIN_INFO_SOCIETE_CP) . '</td></tr>';
 
     $var=!$var;
-    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("CompanyTown").'</td><td>' . $conf->global->MAIN_INFO_SOCIETE_VILLE . '</td></tr>';
+    print '<tr '.$bc[$var].'><td width="35%">'.$langs->trans("CompanyTown").'</td><td>' . (empty($conf->global->MAIN_INFO_SOCIETE_VILLE)?'':$conf->global->MAIN_INFO_SOCIETE_VILLE) . '</td></tr>';
 
     $var=!$var;
     print '<tr '.$bc[$var].'><td>'.$langs->trans("CompanyCountry").'</td><td>';
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 67b6b816ea9..c837de7c9fb 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -68,7 +68,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 
 
 	// Third parties
-	$tmpentry=array('enabled'=>($conf->societe->enabled || $conf->fournisseur->enabled), 'perms'=>($user->rights->societe->lire || $user->rights->fournisseur->lire), 'module'=>'societe|fournisseur');
+	$tmpentry=array('enabled'=>(! empty($conf->societe->enabled) || ! empty($conf->fournisseur->enabled)), 'perms'=>(! empty($user->rights->societe->lire) || ! empty($user->rights->fournisseur->lire)), 'module'=>'societe|fournisseur');
 	$showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode)
 	{
@@ -110,7 +110,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 	}
 
 	// Products-Services
-	$tmpentry=array('enabled'=>($conf->product->enabled || $conf->service->enabled), 'perms'=>($user->rights->produit->lire || $user->rights->service->lire), 'module'=>'product|service');
+	$tmpentry=array('enabled'=>(! empty($conf->product->enabled) || ! empty($conf->service->enabled)), 'perms'=>(! empty($user->rights->produit->lire) || ! empty($user->rights->service->lire)), 'module'=>'product|service');
 	$showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode)
 	{
@@ -160,7 +160,7 @@ function print_eldy_menu($db,$atarget,$type_user)
     if (! empty($conf->fournisseur->enabled)) $menuqualified++;
     if (! empty($conf->contrat->enabled)) $menuqualified++;
     if (! empty($conf->ficheinter->enabled)) $menuqualified++;
-	$tmpentry=array('enabled'=>$menuqualified, 'perms'=>($user->rights->societe->lire || $user->rights->societe->contact->lire), 'module'=>'propal|commande|fournisseur|contrat|ficheinter');
+	$tmpentry=array('enabled'=>$menuqualified, 'perms'=>(! empty($user->rights->societe->lire) || ! empty($user->rights->societe->contact->lire)), 'module'=>'propal|commande|fournisseur|contrat|ficheinter');
 	$showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode)
 	{
@@ -201,7 +201,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 
 	// Financial
 	$tmpentry=array('enabled'=>(! empty($conf->comptabilite->enabled) || ! empty($conf->accounting->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->deplacement->enabled) || ! empty($conf->don->enabled) || ! empty($conf->tax->enabled)),
-		 	 		'perms'=>($user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire || $user->rights->deplacement->lire || $user->rights->don->lire || $user->rights->tax->charges->lire),
+		 	 		'perms'=>(! empty($user->rights->compta->resultat->lire) || ! empty($user->rights->accounting->plancompte->lire) || ! empty($user->rights->facture->lire) || ! empty($user->rights->deplacement->lire) || ! empty($user->rights->don->lire) || ! empty($user->rights->tax->charges->lire)),
 					'module'=>'comptabilite|accounting|facture|deplacement|don|tax');
 	$showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode)
@@ -243,7 +243,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 
     // Bank
 	$tmpentry=array('enabled'=>(! empty($conf->banque->enabled) || ! empty($conf->prelevement->enabled)),
-		 	 		'perms'=>($user->rights->banque->lire || $user->rights->prelevement->lire),
+		 	 		'perms'=>(! empty($user->rights->banque->lire) || ! empty($user->rights->prelevement->lire)),
 					'module'=>'banque|prelevement');
 	$showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode)
@@ -286,7 +286,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 
 	// Projects
 	$tmpentry=array('enabled'=>(! empty($conf->projet->enabled)),
-		 	 		'perms'=>($user->rights->projet->lire),
+		 	 		'perms'=>(! empty($user->rights->projet->lire)),
 					'module'=>'projet');
 	$showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode)
@@ -328,7 +328,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 
 	// Tools
 	$tmpentry=array('enabled'=>(! empty($conf->mailing->enabled) || ! empty($conf->export->enabled) || ! empty($conf->import->enabled)),
-		 	 		'perms'=>($user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run),
+		 	 		'perms'=>(! empty($user->rights->mailing->lire) || ! empty($user->rights->export->lire) || ! empty($user->rights->import->run)),
 					'module'=>'mailing|export|import');
 	$showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode)
@@ -400,7 +400,7 @@ function print_eldy_menu($db,$atarget,$type_user)
 
 	// Members
 	$tmpentry=array('enabled'=>(! empty($conf->adherent->enabled)),
-		 	 		'perms'=>($user->rights->adherent->lire),
+		 	 		'perms'=>(! empty($user->rights->adherent->lire)),
 					'module'=>'adherent');
 	$showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal);
 	if ($showmode)
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index ec82c9e7e41..2695a2fd3d0 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1347,7 +1347,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 	    && $_SESSION["dol_authmode"] != 'http')
 	    {
 	        $logouttext .='<a href="'.DOL_URL_ROOT.'/user/logout.php"';
-	        $logouttext .=$atarget?(' target="'.$atarget.'"'):'';
+	        //$logouttext .=empty($atarget?(' target="'.$atarget.'"'):'';
 	        $logouttext .='>';
 	        $logouttext .= img_picto($langs->trans('Logout'), 'logout.png', 'class="login"');
 	        $logouttext .='</a>';
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 269f428a61a..db147ffde86 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2504,17 +2504,18 @@ class Societe extends CommonObject
     	global $langs;
 
     	$this->id=0;
-    	$this->name=(! empty($conf->global->MAIN_INFO_SOCIETE_NOM))?$conf->global->MAIN_INFO_SOCIETE_NOM:'';
-    	$this->nom=$this->name; 									// deprecated
-    	$this->address=(! empty($conf->global->MAIN_INFO_SOCIETE_ADRESSE))?$conf->global->MAIN_INFO_SOCIETE_ADRESSE:'';
-    	$this->adresse=$this->address; 							// deprecated
-    	$this->zip=(! empty($conf->global->MAIN_INFO_SOCIETE_CP))?$conf->global->MAIN_INFO_SOCIETE_CP:'';
-    	$this->cp=$this->zip;										// deprecated
-    	$this->town=(! empty($conf->global->MAIN_INFO_SOCIETE_VILLE))?$conf->global->MAIN_INFO_SOCIETE_VILLE:'';
-    	$this->ville=$this->town;									// deprecated
-    	$this->state_id=$conf->global->MAIN_INFO_SOCIETE_DEPARTEMENT;
+    	$this->name=empty($conf->global->MAIN_INFO_SOCIETE_NOM)?'':$conf->global->MAIN_INFO_SOCIETE_NOM;
+    	$this->address=empty($conf->global->MAIN_INFO_SOCIETE_ADRESSE)?'':$conf->global->MAIN_INFO_SOCIETE_ADRESSE;
+    	$this->zip=empty($conf->global->MAIN_INFO_SOCIETE_CP)?'':$conf->global->MAIN_INFO_SOCIETE_CP;
+    	$this->town=empty($conf->global->MAIN_INFO_SOCIETE_VILLE)?'':$conf->global->MAIN_INFO_SOCIETE_VILLE;
+    	$this->state_id=empty($conf->global->MAIN_INFO_SOCIETE_DEPARTEMENT)?'':$conf->global->MAIN_INFO_SOCIETE_DEPARTEMENT;
     	$this->note=empty($conf->global->MAIN_INFO_SOCIETE_NOTE)?'':$conf->global->MAIN_INFO_SOCIETE_NOTE;
-
+    	
+    	$this->nom=$this->name; 									// deprecated
+    	$this->adresse=$this->address; 								// deprecated
+    	$this->cp=$this->zip;										// deprecated
+    	$this->ville=$this->town;									// deprecated
+    	   
     	// We define country_id, country_code and country
     	$country_id=$country_code=$country_label='';
     	if (! empty($conf->global->MAIN_INFO_SOCIETE_PAYS))
@@ -2553,13 +2554,13 @@ class Societe extends CommonObject
     	$this->idprof4=empty($conf->global->MAIN_INFO_RCS)?'':$conf->global->MAIN_INFO_RCS;
     	$this->idprof5=empty($conf->global->MAIN_INFO_PROFID5)?'':$conf->global->MAIN_INFO_PROFID5;
     	$this->idprof6=empty($conf->global->MAIN_INFO_PROFID6)?'':$conf->global->MAIN_INFO_PROFID6;
-    	$this->tva_intra=(! empty($conf->global->MAIN_INFO_TVAINTRA))?$conf->global->MAIN_INFO_TVAINTRA:'';	// VAT number, not necessarly INTRA.
-    	$this->capital=(! empty($conf->global->MAIN_INFO_CAPITAL))?$conf->global->MAIN_INFO_CAPITAL:'';
-    	$this->forme_juridique_code=$conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE;
-    	$this->email=(! empty($conf->global->MAIN_INFO_SOCIETE_MAIL))?$conf->global->MAIN_INFO_SOCIETE_MAIL:'';
-    	$this->logo=(! empty($conf->global->MAIN_INFO_SOCIETE_LOGO))?$conf->global->MAIN_INFO_SOCIETE_LOGO:'';
-    	$this->logo_small=(! empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL))?$conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL:'';
-    	$this->logo_mini=(! empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI))?$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI:'';
+    	$this->tva_intra=empty($conf->global->MAIN_INFO_TVAINTRA)?'':$conf->global->MAIN_INFO_TVAINTRA;	// VAT number, not necessarly INTRA.
+    	$this->capital=empty($conf->global->MAIN_INFO_CAPITAL)?'':$conf->global->MAIN_INFO_CAPITAL;
+    	$this->forme_juridique_code=empty($conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE)?'':$conf->global->MAIN_INFO_SOCIETE_FORME_JURIDIQUE;
+    	$this->email=empty($conf->global->MAIN_INFO_SOCIETE_MAIL)?'':$conf->global->MAIN_INFO_SOCIETE_MAIL;
+    	$this->logo=empty($conf->global->MAIN_INFO_SOCIETE_LOGO)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO;
+    	$this->logo_small=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_SMALL;
+    	$this->logo_mini=empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;
 
     	// Define if company use vat or not (Do not use conf->global->FACTURE_TVAOPTION anymore)
     	$this->tva_assuj=((isset($conf->global->FACTURE_TVAOPTION) && $conf->global->FACTURE_TVAOPTION=='franchise')?0:1);

From 0743049dc4276c7eb67afaf3aa24d3ffab8cd457 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Jan 2013 14:57:37 +0100
Subject: [PATCH 046/162] Fix: get list of currencies

---
 htdocs/core/class/html.form.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index a804948bf1d..e71a0f6eafe 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3005,14 +3005,14 @@ class Form
     {
         global $conf,$langs,$user;
 
-        $langs->load_cache_currencies();
+        $langs->load_cache_currencies('');
 
         $out='';
 
         if ($selected=='euro' || $selected=='euros') $selected='EUR';   // Pour compatibilite
 
         $out.= '<select class="flat" name="'.$htmlname.'">';
-        foreach ($this->cache_currencies as $code_iso => $currency)
+        foreach ($langs->cache_currencies as $code_iso => $currency)
         {
         	if ($selected && $selected == $code_iso)
         	{

From 9eaf8af3411ed15c0a35a0ab7ab1e91e980d8b79 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Jan 2013 15:35:29 +0100
Subject: [PATCH 047/162] Fix: Removed warning (this can be normal behaviour)
 Fix: menu manager name has changed

---
 htdocs/adherents/admin/adherent.php     | 2 +-
 htdocs/install/mysql/data/llx_const.sql | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 4cf1e0b7d89..ea481c64661 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -189,7 +189,7 @@ if (! empty($conf->banque->enabled))
 else
 {
     print '<td align="right" colspan="2">';
-    print $langs->trans("WarningModuleNotActive",$langs->transnoentities("Module85Name")).' '.img_warning("","");
+    print $langs->trans("WarningModuleNotActive",$langs->transnoentities("Module85Name"));
     print '</td>';
 }
 print "</tr>\n";
diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql
index 6bbc8320830..ab6f480808b 100644
--- a/htdocs/install/mysql/data/llx_const.sql
+++ b/htdocs/install/mysql/data/llx_const.sql
@@ -55,10 +55,10 @@ insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_M
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SIZE_LISTE_LIMIT','25','chaine','Longueur maximum des listes',0,0);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SHOW_WORKBOARD','1','yesno','Affichage tableau de bord de travail Dolibarr',0,0);
 
-insert into llx_const (name, value, type, note, visible) values ('MAIN_MENU_STANDARD','eldy_backoffice.php','chaine','Module de gestion de la barre de menu pour utilisateurs internes',0);
-insert into llx_const (name, value, type, note, visible) values ('MAIN_MENUFRONT_STANDARD','eldy_frontoffice.php','chaine','Module de gestion de la barre de menu pour utilisateurs externes',0);
-insert into llx_const (name, value, type, note, visible) values ('MAIN_MENU_SMARTPHONE','eldy_backoffice.php','chaine','Module de gestion de la barre de menu smartphone pour utilisateurs internes',0);
-insert into llx_const (name, value, type, note, visible) values ('MAIN_MENUFRONT_SMARTPHONE','eldy_frontoffice.php','chaine','Module de gestion de la barre de menu smartphone pour utilisateurs externes',0);
+insert into llx_const (name, value, type, note, visible) values ('MAIN_MENU_STANDARD','eldy.php','chaine','Menu manager for internal users',0);
+insert into llx_const (name, value, type, note, visible) values ('MAIN_MENUFRONT_STANDARD','eldy.php','chaine','Menu manager for external users',0);
+insert into llx_const (name, value, type, note, visible) values ('MAIN_MENU_SMARTPHONE','eldy.php','chaine','Menu manager for internal users using smartphones',0);
+insert into llx_const (name, value, type, note, visible) values ('MAIN_MENUFRONT_SMARTPHONE','eldy.php','chaine','Menu manager for external users using smartphones',0);
 
 
 --

From 0383080d9055aa28245f3ca8721d3be1fb22662c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Jan 2013 17:37:40 +0100
Subject: [PATCH 048/162] Fix: bad menu file name

---
 htdocs/install/mysql/data/llx_const.sql | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql
index ab6f480808b..e7ac32687cf 100644
--- a/htdocs/install/mysql/data/llx_const.sql
+++ b/htdocs/install/mysql/data/llx_const.sql
@@ -55,10 +55,10 @@ insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_M
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SIZE_LISTE_LIMIT','25','chaine','Longueur maximum des listes',0,0);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SHOW_WORKBOARD','1','yesno','Affichage tableau de bord de travail Dolibarr',0,0);
 
-insert into llx_const (name, value, type, note, visible) values ('MAIN_MENU_STANDARD','eldy.php','chaine','Menu manager for internal users',0);
-insert into llx_const (name, value, type, note, visible) values ('MAIN_MENUFRONT_STANDARD','eldy.php','chaine','Menu manager for external users',0);
-insert into llx_const (name, value, type, note, visible) values ('MAIN_MENU_SMARTPHONE','eldy.php','chaine','Menu manager for internal users using smartphones',0);
-insert into llx_const (name, value, type, note, visible) values ('MAIN_MENUFRONT_SMARTPHONE','eldy.php','chaine','Menu manager for external users using smartphones',0);
+insert into llx_const (name, value, type, note, visible) values ('MAIN_MENU_STANDARD','eldy_menu.php','chaine','Menu manager for internal users',0);
+insert into llx_const (name, value, type, note, visible) values ('MAIN_MENUFRONT_STANDARD','eldy_menu.php','chaine','Menu manager for external users',0);
+insert into llx_const (name, value, type, note, visible) values ('MAIN_MENU_SMARTPHONE','eldy_menu.php','chaine','Menu manager for internal users using smartphones',0);
+insert into llx_const (name, value, type, note, visible) values ('MAIN_MENUFRONT_SMARTPHONE','eldy_menu.php','chaine','Menu manager for external users using smartphones',0);
 
 
 --

From 755325dcf09f139e6dd3b7705ed6bf36c0cb8b60 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Jan 2013 17:59:35 +0100
Subject: [PATCH 049/162] Qual: Removed deprecated file

---
 .../core/menus/standard/eldy_frontoffice.php  | 79 -------------------
 1 file changed, 79 deletions(-)
 delete mode 100644 htdocs/core/menus/standard/eldy_frontoffice.php

diff --git a/htdocs/core/menus/standard/eldy_frontoffice.php b/htdocs/core/menus/standard/eldy_frontoffice.php
deleted file mode 100644
index 2d6d11f28dc..00000000000
--- a/htdocs/core/menus/standard/eldy_frontoffice.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/* Copyright (C) 2005-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2007-2009 Regis Houssin        <regis.houssin@capnetworks.com>
- *
- * 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/core/menus/standard/eldy_menu.php
- *	\brief      Menu eldy manager
- */
-
-
-/**
- *	Class to manage menu Eldy
- */
-class MenuManager
-{
-	var $db;
-	var $type_user;									// Put 0 for internal users, 1 for external users
-	var $atarget="";                                // Valeur du target a utiliser dans les liens
-	var $name="eldy";
-	
-    var $menu_array;
-    var $menu_array_after;
-
-
-    /**
-     *  Constructor
-     *
-	 *  @param	DoliDB		$db     	Database handler
-     *  @param	int			$type_user	Type of user
-     */
-    function __construct($db, $type_user)
-    {
-    	$this->type_user=$type_user;
-        $this->db=$db;
-    }
-
-
-    /**
-     *  Show menu
-     *
-     *	@param	string	$mode			'top' or 'left'
-     *  @return int     				Number of menu entries shown
-     */
-    function showmenu($mode)
-    {
-    	global $conf;
-
-        require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php';
-
-        if ($this->type_user == 1)
-        {
-        	$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);
-        if ($mode == 'left') $res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after);
-        
-        return $res;
-    }
-
-}
-
-?>

From a268592b6196201073bee07fe16941be72f5e1dd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 28 Jan 2013 18:01:50 +0100
Subject: [PATCH 050/162] Qual: Clean not used library.

---
 htdocs/includes/savant/Savant3.php            | 1337 -----------------
 htdocs/includes/savant/Savant3/Error.php      |  125 --
 htdocs/includes/savant/Savant3/Exception.php  |   29 -
 htdocs/includes/savant/Savant3/Filter.php     |   85 --
 htdocs/includes/savant/Savant3/Plugin.php     |   67 -
 .../Savant3_Filter_trimwhitespace.php         |  147 --
 .../resources/Savant3_Plugin_ahref.php        |  109 --
 .../Savant3/resources/Savant3_Plugin_date.php |  123 --
 .../resources/Savant3_Plugin_htmlAttribs.php  |   63 -
 .../resources/Savant3_Plugin_image.php        |  199 ---
 10 files changed, 2284 deletions(-)
 delete mode 100644 htdocs/includes/savant/Savant3.php
 delete mode 100644 htdocs/includes/savant/Savant3/Error.php
 delete mode 100644 htdocs/includes/savant/Savant3/Exception.php
 delete mode 100644 htdocs/includes/savant/Savant3/Filter.php
 delete mode 100644 htdocs/includes/savant/Savant3/Plugin.php
 delete mode 100644 htdocs/includes/savant/Savant3/resources/Savant3_Filter_trimwhitespace.php
 delete mode 100644 htdocs/includes/savant/Savant3/resources/Savant3_Plugin_ahref.php
 delete mode 100644 htdocs/includes/savant/Savant3/resources/Savant3_Plugin_date.php
 delete mode 100644 htdocs/includes/savant/Savant3/resources/Savant3_Plugin_htmlAttribs.php
 delete mode 100644 htdocs/includes/savant/Savant3/resources/Savant3_Plugin_image.php

diff --git a/htdocs/includes/savant/Savant3.php b/htdocs/includes/savant/Savant3.php
deleted file mode 100644
index cdcd4731480..00000000000
--- a/htdocs/includes/savant/Savant3.php
+++ /dev/null
@@ -1,1337 +0,0 @@
-<?php
-
-/**
-* 
-* Provides an object-oriented template system for PHP5.
-* 
-* @package Savant3
-* 
-* @author Paul M. Jones <pmjones@ciaweb.net>
-* 
-* @license http://www.gnu.org/copyleft/lesser.html LGPL
-* 
-* @version $Id: Savant3.php,v 1.42 2006/01/01 18:31:00 pmjones Exp $
-* 
-*/
-
-
-/**
-* Always have these classes available.
-*/
-include_once dirname(__FILE__) . '/Savant3/Filter.php';
-include_once dirname(__FILE__) . '/Savant3/Plugin.php';
-
-
-/**
-* 
-* Provides an object-oriented template system for PHP5.
-* 
-* Savant3 helps you separate business logic from presentation logic
-* using PHP as the template language. By default, Savant3 does not
-* compile templates. However, you may pass an optional compiler object
-* to compile template source to include-able PHP code.  It is E_STRICT
-* compliant for PHP5.
-* 
-* Please see the documentation at {@link http://phpsavant.com/}, and be
-* sure to donate! :-)
-* 
-* @author Paul M. Jones <pmjones@ciaweb.net>
-* 
-* @package Savant3
-* 
-* @version @package_version@
-* 
-*/
-
-class Savant3 {
-	
-	
-	/**
-	* 
-	* Array of configuration parameters.
-	* 
-	* @access protected
-	* 
-	* @var array
-	* 
-	*/
-	
-	protected $__config = array(
-		'template_path' => array(),
-		'resource_path' => array(),
-		'error_text'    => "\n\ntemplate error, examine fetch() result\n\n",
-		'exceptions'    => false,
-		'autoload'      => false,
-		'compiler'      => null,
-		'filters'       => array(),
-		'plugins'       => array(),
-		'template'      => null,
-		'plugin_conf'   => array(),
-		'extract'       => false,
-		'fetch'         => null,
-		'escape'        => array('htmlspecialchars'),
-	);
-	
-	
-	// -----------------------------------------------------------------
-	//
-	// Constructor and magic methods
-	//
-	// -----------------------------------------------------------------
-	
-	
-	/**
-	* 
-	* Constructor.
-	* 
-	* @access public
-	* 
-	* @param array $config An associative array of configuration keys for
-	* the Savant3 object.  Any, or none, of the keys may be set.
-	* 
-	* @return object Savant3 A Savant3 instance.
-	* 
-	*/
-	
-	public function __construct($config = null)
-	{
-		// force the config to an array
-		settype($config, 'array');
-		
-		// set the default template search path
-		if (isset($config['template_path'])) {
-			// user-defined dirs
-			$this->setPath('template', $config['template_path']);
-		} else {
-			// no directories set, use the
-			// default directory only
-			$this->setPath('template', null);
-		}
-		
-		// set the default resource search path
-		if (isset($config['resource_path'])) {
-			// user-defined dirs
-			$this->setPath('resource', $config['resource_path']);
-		} else {
-			// no directories set, use the
-			// default directory only
-			$this->setPath('resource', null);
-		}
-		
-		// set the error reporting text
-		if (isset($config['error_text'])) {
-			$this->setErrorText($config['error_text']);
-		}
-		
-		// set the autoload flag
-		if (isset($config['autoload'])) {
-			$this->setAutoload($config['autoload']);
-		}
-		
-		// set the extraction flag
-		if (isset($config['extract'])) {
-			$this->setExtract($config['extract']);
-		}
-		
-		// set the exceptions flag
-		if (isset($config['exceptions'])) {
-			$this->setExceptions($config['exceptions']);
-		}
-		
-		// set the template to use for output
-		if (isset($config['template'])) {
-			$this->setTemplate($config['template']);
-		}
-		
-		// set the output escaping callbacks
-		if (isset($config['escape'])) {
-			$this->setEscape($config['escape']);
-		}
-		
-		// set the default plugin configs
-		if (isset($config['plugin_conf']) && is_array($config['plugin_conf'])) {
-			foreach ($config['plugin_conf'] as $name => $opts) {
-				$this->setPluginConf($name, $opts);
-			}
-		}
-		
-		// set the default filter callbacks
-		if (isset($config['filters'])) {
-			$this->addFilters($config['filters']);
-		}
-	}
-	
-	
-	/**
-	*
-	* Executes a main plugin method with arbitrary parameters.
-	* 
-	* @access public
-	* 
-	* @param string $func The plugin method name.
-	*
-	* @param array $args The parameters passed to the method.
-	*
-	* @return mixed The plugin output, or a Savant3_Error with an
-	* ERR_PLUGIN code if it can't find the plugin.
-	* 
-	*/
-	
-	public function __call($func, $args)
-	{
-		$plugin = $this->plugin($func);
-		
-		if ($this->isError($plugin)) {
-			return $plugin;
-		}
-		
-		// try to avoid the very-slow call_user_func_array()
-		// for plugins with very few parameters.  thanks to
-		// Andreas Korthaus for profiling the code to find
-		// the slowdown.
-		switch (count($args)) {
-		
-		case 0:
-			return $plugin->$func();
-		
-		case 1:
-			return $plugin->$func($args[0]);
-			break;
-			
-		case 2:
-			return $plugin->$func($args[0], $args[1]);
-			break;
-			
-		case 3:
-			return $plugin->$func($args[0], $args[1], $args[2]);
-			break;
-		
-		default:
-			return call_user_func_array(array($plugin, $func), $args);
-			break;
-		}
-	}
-	
-	
-	/**
-	* 
-	* Magic method to echo this object as template output.
-	* 
-	* Note that if there is an error, this will output a simple
-	* error text string and will not return an error object.  Use
-	* fetch() to get an error object when errors occur.
-	* 
-	* @access public
-	*  
-	* @return string The template output.
-	* 
-	*/
-	
-	public function __toString()
-	{
-		return $this->getOutput();
-	}
-	
-	
-	/**
-	* 
-	* Reports the API version for this class.
-	* 
-	* @access public
-	* 
-	* @return string A PHP-standard version number.
-	* 
-	*/
-	
-	public function apiVersion()
-	{
-		return '@package_version@';
-	}
-	
-	
-	/**
-	* 
-	* Returns an internal plugin object; creates it as needed.
-	* 
-	* @access public
-	* 
-	* @param string $name The plugin name.  If this plugin has not
-	* been created yet, this method creates it automatically.
-	*
-	* @return mixed The plugin object, or a Savant3_Error with an
-	* ERR_PLUGIN code if it can't find the plugin.
-	* 
-	*/
-	
-	public function plugin($name)
-	{
-		// shorthand reference
-		$plugins =& $this->__config['plugins'];
-		$autoload = $this->__config['autoload'];
-		
-		// is the plugin method object already instantiated?
-		if (! array_key_exists($name, $plugins)) {
-			
-			// not already instantiated, so load it up.
-			// set up the class name.
-			$class = "Savant3_Plugin_$name";
-			
-			// has the class been loaded?
-			if (! class_exists($class, $autoload)) {
-			
-				// class is not loaded, set up the file name.
-				$file = "$class.php";
-				
-				// make sure the class file is available from the resource path.
-				$result = $this->findFile('resource', $file);
-				if (! $result) {
-					// not available, this is an error
-					return $this->error(
-						'ERR_PLUGIN',
-						array('method' => $name)
-					);
-				} else {
-					// available, load the class file
-					include_once $result;
-				}
-			}
-			
-			// get the default configuration for the plugin.
-			$plugin_conf =& $this->__config['plugin_conf'];
-			if (! empty($plugin_conf[$name])) {
-				$opts = $plugin_conf[$name];
-			} else {
-				$opts = array();
-			}
-			
-			// add the Savant reference
-			$opts['Savant'] = $this;
-			
-			// instantiate the plugin with its options.
-			$plugins[$name] = new $class($opts);
-		}
-	
-		// return the plugin object
-		return $plugins[$name];
-	}
-	
-	
-	// -----------------------------------------------------------------
-	//
-	// Public configuration management (getters and setters).
-	// 
-	// -----------------------------------------------------------------
-	
-	
-	/**
-	*
-	* Returns a copy of the Savant3 configuration parameters.
-	*
-	* @access public
-	* 
-	* @param string $key The specific configuration key to return.  If null,
-	* returns the entire configuration array.
-	* 
-	* @return mixed A copy of the $this->__config array.
-	* 
-	*/
-	
-	public function getConfig($key = null)
-	{
-		if (is_null($key)) {
-			// no key requested, return the entire config array
-			return $this->__config;
-		} elseif (empty($this->__config[$key])) {
-			// no such key
-			return null;
-		} else {
-			// return the requested key
-			return $this->__config[$key];
-		}
-	}
-	
-	
-	/**
-	* 
-	* Sets __autoload() usage on or off.
-	* 
-	* @access public
-	* 
-	* @param bool $flag True to use __autoload(), false to not use it.
-	* 
-	* @return void
-	* 
-	*/
-	
-	public function setAutoload($flag)
-	{
-		$this->__config['autoload'] = (bool) $flag;
-	}
-	
-	
-	/**
-	* 
-	* Sets a custom compiler/pre-processor callback for template sources.
-	* 
-	* By default, Savant3 does not use a compiler; use this to set your
-	* own custom compiler (pre-processor) for template sources.
-	* 
-	* @access public
-	* 
-	* @param mixed $compiler A compiler callback value suitable for the
-	* first parameter of call_user_func().  Set to null/false/empty to
-	* use PHP itself as the template markup (i.e., no compiling).
-	* 
-	* @return void
-	* 
-	*/
-	
-	public function setCompiler($compiler)
-	{
-		$this->__config['compiler'] = $compiler;
-	}
-	
-	
-	/**
-	* 
-	* Sets the custom error text for __toString().
-	* 
-	* @access public
-	* 
-	* @param string $text The error text when a template is echoed.
-	* 
-	* @return void
-	* 
-	*/
-	
-	public function setErrorText($text)
-	{
-		$this->__config['error_text'] = $text;
-	}
-	
-	
-	/**
-	* 
-	* Sets whether or not exceptions will be thrown.
-	* 
-	* @access public
-	* 
-	* @param bool $flag True to turn on exception throwing, false
-	* to turn it off.
-	* 
-	* @return void
-	* 
-	*/
-	
-	public function setExceptions($flag)
-	{
-		$this->__config['exceptions'] = (bool) $flag;
-	}
-	
-	
-	/**
-	* 
-	* Sets whether or not variables will be extracted.
-	* 
-	* @access public
-	* 
-	* @param bool $flag True to turn on variable extraction, false
-	* to turn it off.
-	* 
-	* @return void
-	* 
-	*/
-	
-	public function setExtract($flag)
-	{
-		$this->__config['extract'] = (bool) $flag;
-	}
-	
-	
-	/**
-	*
-	* Sets config array for a plugin.
-	* 
-	* @access public
-	* 
-	* @param string $plugin The plugin to configure.
-	* 
-	* @param array $config The configuration array for the plugin.
-	* 
-	* @return void
-	*
-	*/
-	
-	public function setPluginConf($plugin, $config = null)
-	{
-		$this->__config['plugin_conf'][$plugin] = $config;
-	}
-	
-	
-	/**
-	*
-	* Sets the template name to use.
-	*
-	* @access public
-	*
-	* @param string $template The template name.
-	*
-	* @return void
-	*
-	*/
-	
-	public function setTemplate($template)
-	{
-		$this->__config['template'] = $template;
-	}
-	
-	
-	// -----------------------------------------------------------------
-	//
-	// Output escaping and management.
-	//
-	// -----------------------------------------------------------------
-	
-	
-	/**
-	* 
-	* Clears then sets the callbacks to use when calling $this->escape().
-	* 
-	* Each parameter passed to this function is treated as a separate
-	* callback.  For example:
-	* 
-	* <code>
-	* $savant->setEscape(
-	*     'stripslashes',
-	*     'htmlspecialchars',
-	*     array('StaticClass', 'method'),
-	*     array($object, $method)
-	* );
-	* </code>
-	* 
-	* @access public
-	*
-	* @return void
-	*
-	*/
-	
-	public function setEscape()
-	{
-		$this->__config['escape'] = (array) @func_get_args();
-	}
-	
-	
-	/**
-	* 
-	* Adds to the callbacks used when calling $this->escape().
-	* 
-	* Each parameter passed to this function is treated as a separate
-	* callback.  For example:
-	* 
-	* <code>
-	* $savant->addEscape(
-	*     'stripslashes',
-	*     'htmlspecialchars',
-	*     array('StaticClass', 'method'),
-	*     array($object, $method)
-	* );
-	* </code>
-	* 
-	* @access public
-	*
-	* @return void
-	*
-	*/
-	
-	public function addEscape()
-	{
-		$args = (array) @func_get_args();
-		$this->__config['escape'] = array_merge(
-			$this->__config['escape'], $args
-		);
-	}
-	
-	
-	/**
-	*
-	* Gets the array of output-escaping callbacks.
-	*
-	* @access public
-	*
-	* @return array The array of output-escaping callbacks.
-	*
-	*/
-	
-	public function getEscape()
-	{
-		return $this->__config['escape'];
-	}
-	
-	
-	/**
-	*
-	* Applies escaping to a value.
-	* 
-	* You can override the predefined escaping callbacks by passing
-	* added parameters as replacement callbacks.
-	* 
-	* <code>
-	* // use predefined callbacks
-	* $result = $savant->escape($value);
-	* 
-	* // use replacement callbacks
-	* $result = $savant->escape(
-	*     $value,
-	*     'stripslashes',
-	*     'htmlspecialchars',
-	*     array('StaticClass', 'method'),
-	*     array($object, $method)
-	* );
-	* </code>
-	*
-	* 
-	* Unfortunately, a call to "echo htmlspecialchars()" is twice
-	* as fast as a call to "echo $this->escape()" under the default
-	* escaping (which is htmlspecialchars).  The benchmark showed
-	* 0.007 seconds for htmlspecialchars(), and 0.014 seconds for
-	* $this->escape(), on 300 calls each.
-	* 
-	* @access public
-	* 
-	* @param mixed $value The value to be escaped.
-	* 
-	* @return mixed
-	*
-	*/
-	
-	public function escape($value)
-	{
-		// were custom callbacks passed?
-		if (func_num_args() == 1) {
-		
-			// no, only a value was passed.
-			// loop through the predefined callbacks.
-			foreach ($this->__config['escape'] as $func) {
-				// this if() shaves 0.001sec off of 300 calls.
-				if (is_string($func)) {
-					$value = $func($value);
-				} else {
-					$value = call_user_func($func, $value);
-				}
-			}
-			
-		} else {
-		
-			// yes, use the custom callbacks
-			$callbacks = func_get_args();
-			
-			// drop $value
-			array_shift($callbacks);
-			
-			// loop through custom callbacks.
-			foreach ($callbacks as $func) {
-				// this if() shaves 0.001sec off of 300 calls.
-				if (is_string($func)) {
-					$value = $func($value);
-				} else {
-					$value = call_user_func($func, $value);
-				}
-			}
-			
-		}
-		
-		return $value;
-	}
-	
-	
-	/**
-	*
-	* Prints a value after escaping it for output.
-	* 
-	* You can override the predefined escaping callbacks by passing
-	* added parameters as replacement callbacks.
-	* 
-	* <code>
-	* // use predefined callbacks
-	* $this->eprint($value);
-	* 
-	* // use replacement callbacks
-	* $this->eprint(
-	*     $value,
-	*     'stripslashes',
-	*     'htmlspecialchars',
-	*     array('StaticClass', 'method'),
-	*     array($object, $method)
-	* );
-	* </code>
-	* 
-	* @access public
-	* 
-	* @param mixed $value The value to be escaped and printed.
-	* 
-	* @return void
-	*
-	*/
-	
-	public function eprint($value)
-	{
-		// avoid the very slow call_user_func_array() when there
-		// are no custom escaping callbacks.  thanks to
-		// Andreas Korthaus for profiling the code to find
-		// the slowdown.
-		$num = func_num_args();
-		if ($num == 1) {
-			echo $this->escape($value);
-		} else {
-			$args = func_get_args();
-			echo call_user_func_array(
-				array($this, 'escape'),
-				$args
-			);
-		}
-	}
-	
-	
-	// -----------------------------------------------------------------
-	//
-	// File management
-	//
-	// -----------------------------------------------------------------
-	
-	
-	/**
-	*
-	* Sets an entire array of search paths for templates or resources.
-	*
-	* @access public
-	*
-	* @param string $type The type of path to set, typically 'template'
-	* or 'resource'.
-	* 
-	* @param string|array $path The new set of search paths.  If null or
-	* false, resets to the current directory only.
-	*
-	* @return void
-	*
-	*/
-	
-	public function setPath($type, $path)
-	{
-		// clear out the prior search dirs
-		$this->__config[$type . '_path'] = array();
-		
-		// always add the fallback directories as last resort
-		switch (strtolower($type)) {
-		case 'template':
-			// the current directory
-			$this->addPath($type, '.');
-			break;
-		case 'resource':
-			// the Savant3 distribution resources
-			$this->addPath($type, dirname(__FILE__) . '/Savant3/resources/');
-			break;
-		}
-		
-		// actually add the user-specified directories
-		$this->addPath($type, $path);
-	}
-	
-	
-	/**
-	*
-	* Adds to the search path for templates and resources.
-	*
-	* @access public
-	*
-	* @param string|array $path The directory or stream to search.
-	*
-	* @return void
-	*
-	*/
-	
-	public function addPath($type, $path)
-	{
-		// convert from path string to array of directories
-		if (is_string($path) && ! strpos($path, '://')) {
-		
-			// the path config is a string, and it's not a stream
-			// identifier (the "://" piece). add it as a path string.
-			$path = explode(PATH_SEPARATOR, $path);
-			
-			// typically in path strings, the first one is expected
-			// to be searched first. however, Savant3 uses a stack,
-			// so the first would be last.  reverse the path string
-			// so that it behaves as expected with path strings.
-			$path = array_reverse($path);
-			
-		} else {
-		
-			// just force to array
-			settype($path, 'array');
-			
-		}
-		
-		// loop through the path directories
-		foreach ($path as $dir) {
-		
-			// no surrounding spaces allowed!
-			$dir = trim($dir);
-			
-			// add trailing separators as needed
-			if (strpos($dir, '://') && substr($dir, -1) != '/') {
-				// stream
-				$dir .= '/';
-			} elseif (substr($dir, -1) != DIRECTORY_SEPARATOR) {
-				// directory
-				$dir .= DIRECTORY_SEPARATOR;
-			}
-			
-			// add to the top of the search dirs
-			array_unshift(
-				$this->__config[$type . '_path'],
-				$dir
-			);
-		}
-	}
-	
-	
-	/**
-	* 
-	* Searches the directory paths for a given file.
-	* 
-	* @param array $type The type of path to search (template or resource).
-	* 
-	* @param string $file The file name to look for.
-	* 
-	* @return string|bool The full path and file name for the target file,
-	* or boolean false if the file is not found in any of the paths.
-	*
-	*/
-	
-	protected function findFile($type, $file)
-	{
-		// get the set of paths
-		$set = $this->__config[$type . '_path'];
-		
-		// start looping through the path set
-		foreach ($set as $path) {
-			
-			// get the path to the file
-			$fullname = $path . $file;
-			
-			// is the path based on a stream?
-			if (strpos($path, '://') === false) {
-				// not a stream, so do a realpath() to avoid
-				// directory traversal attempts on the local file
-				// system. Suggested by Ian Eure, initially
-				// rejected, but then adopted when the secure
-				// compiler was added.
-				$path = realpath($path); // needed for substr() later
-				$fullname = realpath($fullname);
-			}
-			
-			// the substr() check added by Ian Eure to make sure
-			// that the realpath() results in a directory registered
-			// with Savant so that non-registered directores are not
-			// accessible via directory traversal attempts.
-			if (file_exists($fullname) && is_readable($fullname) &&
-				substr($fullname, 0, strlen($path)) == $path) {
-				return $fullname;
-			}
-		}
-		
-		// could not find the file in the set of paths
-		return false;
-	}
-	
-	
-	// -----------------------------------------------------------------
-	//
-	// Variable and reference assignment
-	//
-	// -----------------------------------------------------------------
-	
-	
-	/**
-	* 
-	* Sets variables for the template (by copy).
-	* 
-	* This method is overloaded; you can assign all the properties of
-	* an object, an associative array, or a single value by name.
-	* 
-	* You are not allowed to assign any variable named '__config' as
-	* it would conflict with internal configuration tracking.
-	* 
-	* In the following examples, the template will have two variables
-	* assigned to it; the variables will be known inside the template as
-	* "$this->var1" and "$this->var2".
-	* 
-	* <code>
-	* $Savant3 = new Savant3();
-	* 
-	* // assign by object
-	* $obj = new stdClass;
-	* $obj->var1 = 'something';
-	* $obj->var2 = 'else';
-	* $Savant3->assign($obj);
-	* 
-	* // assign by associative array
-	* $ary = array('var1' => 'something', 'var2' => 'else');
-	* $Savant3->assign($ary);
-	* 
-	* // assign by name and value
-	* $Savant3->assign('var1', 'something');
-	* $Savant3->assign('var2', 'else');
-	* 
-	* // assign directly
-	* $Savant3->var1 = 'something';
-	* $Savant3->var2 = 'else';
-	* </code>
-	* 
-	* @access public
-	* 
-	* @return bool True on success, false on failure.
-	* 
-	*/
-	
-	public function assign()
-	{
-		// get the arguments; there may be 1 or 2.
-		$arg0 = @func_get_arg(0);
-		$arg1 = @func_get_arg(1);
-		
-		// assign from object
-		if (is_object($arg0)) {
-			// assign public properties
-			foreach (get_object_vars($arg0) as $key => $val) {
-				// can't assign to __config
-				if ($key != '__config') {
-					$this->$key = $val;
-				}
-			}
-			return true;
-		}
-		
-		// assign from associative array
-		if (is_array($arg0)) {
-			foreach ($arg0 as $key => $val) {
-				// can't assign to __config
-				if ($key != '__config') {
-					$this->$key = $val;
-				}
-			}
-			return true;
-		}
-		
-		// assign by name and value (can't assign to __config).
-		if (is_string($arg0) && func_num_args() > 1 && $arg0 != '__config') {
-			$this->$arg0 = $arg1;
-			return true;
-		}
-		
-		// $arg0 was not object, array, or string.
-		return false;
-	}
-	
-	
-	/**
-	* 
-	* Sets variables for the template (by reference).
-	* 
-	* You are not allowed to assign any variable named '__config' as
-	* it would conflict with internal configuration tracking.
-	* 
-	* <code>
-	* $Savant3 = new Savant3();
-	* 
-	* // assign by name and value
-	* $Savant3->assignRef('var1', $ref);
-	* 
-	* // assign directly
-	* $Savant3->ref =& $var1;
-	* </code>
-	* 
-	* @access public
-	* 
-	* @return bool True on success, false on failure.
-	* 
-	*/
-	
-	public function assignRef($key, &$val)
-	{
-		// assign by name and reference (can't assign to __config).
-		if ($key != '__config') {
-			$this->$key =& $val;
-			return true;
-		} else {
-			return false;
-		}
-	}
-	
-	
-	// -----------------------------------------------------------------
-	//
-	// Template processing
-	//
-	// -----------------------------------------------------------------
-	
-	
-	/**
-	* 
-	* Displays a template directly (equivalent to <code>echo $tpl</code>).
-	* 
-	* @access public
-	* 
-	* @param string $tpl The template source to compile and display.
-	* 
-	* @return void
-	* 
-	*/
-	
-	public function display($tpl = null)
-	{
-		echo $this->getOutput($tpl);
-	}
-	
-	/**
-	 * Returns output, including error_text if an error occurs.
-	 * 
-	 * @param $tpl The template to process; if null, uses the
-	 * default template set with setTemplate().
-	 * 
-	 * @return string The template output.
-	 */
-	public function getOutput($tpl = null)
-	{
-	    $output = $this->fetch($tpl);
-        if ($this->isError($output)) {
-            $text = $this->__config['error_text'];
-            return $this->escape($text);
-        } else {
-            return $output;
-        }
-	}
-	
-	
-	/**
-	* 
-	* Compiles, executes, and filters a template source.
-	* 
-	* @access public
-	* 
-	* @param string $tpl The template to process; if null, uses the
-	* default template set with setTemplate().
-	* 
-	* @return mixed The template output string, or a Savant3_Error.
-	* 
-	*/
-	
-	public function fetch($tpl = null)
-	{
-		// make sure we have a template source to work with
-		if (is_null($tpl)) {
-			$tpl = $this->__config['template'];
-		}
-		
-		// get a path to the compiled template script
-		$result = $this->template($tpl);
-		
-		// did we get a path?
-		if (! $result || $this->isError($result)) {
-		
-			// no. return the error result.
-			return $result;
-			
-		} else {
-		
-			// yes.  execute the template script.  move the script-path
-			// out of the local scope, then clean up the local scope to
-			// avoid variable name conflicts.
-			$this->__config['fetch'] = $result;
-			unset($result);
-			unset($tpl);
-			
-			// are we doing extraction?
-			if ($this->__config['extract']) {
-				// pull variables into the local scope.
-				extract(get_object_vars($this), EXTR_REFS);
-			}
-			
-			// buffer output so we can return it instead of displaying.
-			ob_start();
-			
-			// are we using filters?
-			if ($this->__config['filters']) {
-				// use a second buffer to apply filters. we used to set
-				// the ob_start() filter callback, but that would
-				// silence errors in the filters. Hendy Irawan provided
-				// the next three lines as a "verbose" fix.
-				ob_start();
-				include $this->__config['fetch'];
-				echo $this->applyFilters(ob_get_clean());
-			} else {
-				// no filters being used.
-				include $this->__config['fetch'];
-			}
-			
-			// reset the fetch script value, get the buffer, and return.
-			$this->__config['fetch'] = null;
-			return ob_get_clean();
-		}
-	}
-	
-	
-	/**
-	*
-	* Compiles a template and returns path to compiled script.
-	* 
-	* By default, Savant does not compile templates, it uses PHP as the
-	* markup language, so the "compiled" template is the same as the source
-	* template.
-	* 
-	* Used inside a template script like so:
-	* 
-	* <code>
-	* include $this->template($tpl);
-	* </code>
-	* 
-	* @access protected
-	*
-	* @param string $tpl The template source name to look for.
-	* 
-	* @return string The full path to the compiled template script.
-	* 
-	* @throws object An error object with a 'ERR_TEMPLATE' code.
-	* 
-	*/
-	
-	protected function template($tpl = null)
-	{
-		// set to default template if none specified.
-		if (is_null($tpl)) {
-			$tpl = $this->__config['template'];
-		}
-		
-		// find the template source.
-		$file = $this->findFile('template', $tpl);
-		if (! $file) {
-			return $this->error(
-				'ERR_TEMPLATE',
-				array('template' => $tpl)
-			);
-		}
-		
-		// are we compiling source into a script?
-		if ($this->__config['compiler']) {
-			// compile the template source and get the path to the
-			// compiled script (will be returned instead of the
-			// source path)
-			$result = call_user_func(
-				array($this->__config['compiler'], 'compile'),
-				$file
-			);
-		} else {
-			// no compiling requested, use the source path
-			$result = $file;
-		}
-		
-		// is there a script from the compiler?
-		if (! $result || $this->isError($result)) {
-			// return an error, along with any error info
-			// generated by the compiler.
-			return $this->error(
-				'ERR_COMPILER',
-				array(
-					'template' => $tpl,
-					'compiler' => $result
-				)
-			);
-		} else {
-			// no errors, the result is a path to a script
-			return $result;
-		}
-	}
-	
-	
-	// -----------------------------------------------------------------
-	//
-	// Filter management and processing
-	//
-	// -----------------------------------------------------------------
-	
-	
-	/**
-	* 
-	* Resets the filter stack to the provided list of callbacks.
-	* 
-	* @access protected
-	* 
-	* @param array An array of filter callbacks.
-	* 
-	* @return void
-	* 
-	*/
-	
-	public function setFilters()
-	{
-		$this->__config['filters'] = (array) @func_get_args();
-	}
-	
-	
-	/**
-	* 
-	* Adds filter callbacks to the stack of filters.
-	* 
-	* @access protected
-	* 
-	* @param array An array of filter callbacks.
-	* 
-	* @return void
-	* 
-	*/
-	
-	public function addFilters()
-	{
-		// add the new filters to the static config variable
-		// via the reference
-		foreach ((array) @func_get_args() as $callback) {
-			$this->__config['filters'][] = $callback;
-		}
-	}
-	
-	
-	/**
-	* 
-	* Runs all filter callbacks on buffered output.
-	* 
-	* @access protected
-	* 
-	* @param string The template output.
-	* 
-	* @return void
-	* 
-	*/
-	
-	protected function applyFilters($buffer)
-	{
-	   $autoload = $this->__config['autoload'];
-		foreach ($this->__config['filters'] as $callback) {
-		
-			// if the callback is a static Savant3_Filter method,
-			// and not already loaded, try to auto-load it.
-			if (is_array($callback) &&
-				is_string($callback[0]) &&
-				substr($callback[0], 0, 15) == 'Savant3_Filter_' &&
-				! class_exists($callback[0], $autoload)) {
-				
-				// load the Savant3_Filter_*.php resource
-				$file = $callback[0] . '.php';
-				$result = $this->findFile('resource', $file);
-				if ($result) {
-					include_once $result;
-				}
-			}
-			
-			// can't pass a third $this param, it chokes the OB system.
-			$buffer = call_user_func($callback, $buffer);
-		}
-		
-		return $buffer;
-	}
-	
-	
-	// -----------------------------------------------------------------
-	//
-	// Error handling
-	//
-	// -----------------------------------------------------------------
-	
-	
-	/**
-	*
-	* Returns an error object or throws an exception.
-	* 
-	* @access public
-	* 
-	* @param string $code A Savant3 'ERR_*' string.
-	* 
-	* @param array $info An array of error-specific information.
-	* 
-	* @param int $level The error severity level, default is
-	* E_USER_ERROR (the most severe possible).
-	* 
-	* @param bool $trace Whether or not to include a backtrace, default
-	* true.
-	* 
-	* @return object Savant3_Error
-	* 
-	*/
-	
-	public function error($code, $info = array(), $level = E_USER_ERROR,
-		$trace = true)
-	{
-		$autoload = $this->__config['autoload'];
-		
-		// are we throwing exceptions?
-		if ($this->__config['exceptions']) {
-			if (! class_exists('Savant3_Exception', $autoload)) {
-				include_once dirname(__FILE__) . '/Savant3/Exception.php';
-			}
-			throw new Savant3_Exception($code);
-		}
-		
-		
-		// the error config array
-		$config = array(
-			'code'  => $code,
-			'info'  => (array) $info,
-			'level' => $level,
-			'trace' => $trace
-		);
-		
-		// make sure the Savant3 error class is available
-		if (! class_exists('Savant3_Error', $autoload)) {
-			include_once dirname(__FILE__) . '/Savant3/Error.php';
-		}
-		
-		// return it
-		$err = new Savant3_Error($config);
-		return $err;
-	}
-	
-	
-	/**
-	*
-	* Tests if an object is of the Savant3_Error class.
-	* 
-	* @access public
-	* 
-	* @param object $obj The object to be tested.
-	* 
-	* @return boolean True if $obj is an error object of the type
-	* Savant3_Error, or is a subclass that Savant3_Error. False if not.
-	*
-	*/
-	
-	public function isError($obj)
-	{
-		$autoload = $this->__config['autoload'];
-		
-		// is it even an object?
-		if (! is_object($obj)) {
-			// not an object, so can't be a Savant3_Error
-			return false;
-		} else {
-			// make sure the Savant3 error class is available for
-			// comparison
-			if (! class_exists('Savant3_Error', $autoload)) {
-				include_once dirname(__FILE__) . '/Savant3/Error.php';
-			}
-			// now compare the parentage
-			$is = $obj instanceof Savant3_Error;
-			$sub = is_subclass_of($obj, 'Savant3_Error');
-			return ($is || $sub);
-		}
-	}
-}
-?>
\ No newline at end of file
diff --git a/htdocs/includes/savant/Savant3/Error.php b/htdocs/includes/savant/Savant3/Error.php
deleted file mode 100644
index 211fc2af233..00000000000
--- a/htdocs/includes/savant/Savant3/Error.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-/**
-* 
-* Provides a simple error class for Savant.
-*
-* @package Savant3
-* 
-* @author Paul M. Jones <pmjones@ciaweb.net>
-* 
-* @license http://www.gnu.org/copyleft/lesser.html LGPL
-* 
-* @version $Id: Error.php,v 1.5 2005/05/27 14:03:50 pmjones Exp $
-* 
-*/
-
-/**
-* 
-* Provides a simple error class for Savant.
-*
-* @package Savant3
-* 
-* @author Paul M. Jones <pmjones@ciaweb.net>
-* 
-*/
-
-class Savant3_Error {
-	
-	
-	/**
-	* 
-	* The error code, typically a Savant 'ERR_*' string.
-	* 
-	* @access public
-	*
-	* @var string
-	*
-	*/
-	
-	public $code = null;
-	
-	
-	/**
-	* 
-	* An array of error-specific information.
-	* 
-	* @access public
-	*
-	* @var array
-	*
-	*/
-	
-	public $info = array();
-	
-	
-	/**
-	* 
-	* The error severity level.
-	*
-	* @access public
-	*
-	* @var int
-	*
-	*/
-	
-	public $level = E_USER_ERROR;
-	
-	
-	/**
-	* 
-	* A debug backtrace for the error, if any.
-	*
-	* @access public
-	*
-	* @var array
-	*
-	*/
-	
-	public $trace = null;
-	
-	
-	/**
-	* 
-	* Constructor.
-	*
-	* @access public
-	*
-	* @param array $conf An associative array where the key is a
-	* Savant3_Error property and the value is the value for that
-	* property.
-	*
-	*/
-	
-	public function __construct($conf = array())
-	{
-		// set public properties
-		foreach ($conf as $key => $val) {
-			$this->$key = $val;
-		}
-		
-		// add a backtrace
-		if ($conf['trace'] === true) {
-			$this->trace = debug_backtrace();
-		}
-	}
-	
-	
-	/**
-	* 
-	* Magic method for output dump.
-	*
-	* @access public
-	*
-	* @return void
-	*/
-	
-	public function __toString()
-	{
-		ob_start();
-		echo get_class($this) . ': ';
-		print_r(get_object_vars($this));
-		return ob_get_clean();
-	}
-}
-?>
\ No newline at end of file
diff --git a/htdocs/includes/savant/Savant3/Exception.php b/htdocs/includes/savant/Savant3/Exception.php
deleted file mode 100644
index f564115be34..00000000000
--- a/htdocs/includes/savant/Savant3/Exception.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
-* 
-* Throws PHP5 exceptions for Savant.
-*
-* @package Savant3
-* 
-* @author Paul M. Jones <pmjones@ciaweb.net>
-* 
-* @license http://www.gnu.org/copyleft/lesser.html LGPL
-* 
-* @version $Id: Exception.php,v 1.1 2005/05/27 14:04:36 pmjones Exp $
-* 
-*/
-
-
-/**
-* 
-* A simple Savant3_Exception class.
-* 
-* @package Savant3
-* 
-* @author Paul M. Jones <pmjones@ciaweb.net>
-* 
-*/
-
-class Savant3_Exception extends Exception {
-}
-?>
\ No newline at end of file
diff --git a/htdocs/includes/savant/Savant3/Filter.php b/htdocs/includes/savant/Savant3/Filter.php
deleted file mode 100644
index 836f8fbeabb..00000000000
--- a/htdocs/includes/savant/Savant3/Filter.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
-* 
-* Abstract Savant3_Filter class.
-* 
-* @package Savant3
-* 
-* @author Paul M. Jones <pmjones@ciaweb.net>
-* 
-* @license http://www.gnu.org/copyleft/lesser.html LGPL
-* 
-* @version $Id: Filter.php,v 1.5 2005/04/29 16:23:50 pmjones Exp $
-*
-*/
-
-/**
-* 
-* Abstract Savant3_Filter class.
-*
-* You have to extend this class for it to be useful; e.g., "class
-* Savant3_Filter_example extends Savant3_Filter".
-* 
-* @package Savant3
-* 
-* @author Paul M. Jones <pmjones@ciaweb.net>
-* 
-*/
-
-abstract class Savant3_Filter {
-	
-	
-	/**
-	* 
-	* Optional reference to the calling Savant object.
-	* 
-	* @access protected
-	* 
-	* @var object
-	* 
-	*/
-	
-	protected $Savant = null;
-	
-	
-	/**
-	* 
-	* Constructor.
-	* 
-	* @access public
-	* 
-	* @param array $conf An array of configuration keys and values for
-	* this filter.
-	* 
-	* @return void
-	* 
-	*/
-	
-	public function __construct($conf = null)
-	{
-		settype($conf, 'array');
-		foreach ($conf as $key => $val) {
-			$this->$key = $val;
-		}
-	}
-	
-	
-	/**
-	* 
-	* Stub method for extended behaviors.
-	*
-	* @access public
-	* 
-	* @param string $text The text buffer to filter.
-	*
-	* @return string The text buffer after it has been filtered.
-	*
-	*/
-	
-	public static function filter($text)
-	{
-		return $text;
-	}
-}
-?>
\ No newline at end of file
diff --git a/htdocs/includes/savant/Savant3/Plugin.php b/htdocs/includes/savant/Savant3/Plugin.php
deleted file mode 100644
index ca7a0b471e7..00000000000
--- a/htdocs/includes/savant/Savant3/Plugin.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
-* 
-* Abstract Savant3_Plugin class.
-* 
-* @package Savant3
-* 
-* @author Paul M. Jones <pmjones@ciaweb.net>
-* 
-* @license http://www.gnu.org/copyleft/lesser.html LGPL
-* 
-* @version $Id: Plugin.php,v 1.5 2005/04/29 16:23:50 pmjones Exp $
-*
-*/
-
-/**
-* 
-* Abstract Savant3_Plugin class.
-*
-* You have to extend this class for it to be useful; e.g., "class
-* Savant3_Plugin_example extends Savant2_Plugin".  Be sure to add a
-* method named for the plugin itself; e.g., "function example()".
-* 
-* @package Savant3
-* 
-* @author Paul M. Jones <pmjones@ciaweb.net>
-* 
-*/
-
-abstract class Savant3_Plugin {
-	
-	/**
-	* 
-	* Reference to the calling Savant object.
-	* 
-	* @access protected
-	* 
-	* @var object
-	* 
-	*/
-	
-	protected $Savant = null;
-	
-	
-	/**
-	* 
-	* Constructor.
-	* 
-	* @access public
-	* 
-	* @param array $conf An array of configuration keys and values for
-	* this plugin.
-	* 
-	* @return void
-	* 
-	*/
-	
-	public function __construct($conf = null)
-	{
-		settype($conf, 'array');
-		foreach ($conf as $key => $val) {
-			$this->$key = $val;
-		}
-	}
-}
-?>
\ No newline at end of file
diff --git a/htdocs/includes/savant/Savant3/resources/Savant3_Filter_trimwhitespace.php b/htdocs/includes/savant/Savant3/resources/Savant3_Filter_trimwhitespace.php
deleted file mode 100644
index 198362802d2..00000000000
--- a/htdocs/includes/savant/Savant3/resources/Savant3_Filter_trimwhitespace.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-
-/**
-* 
-* Filter to remove extra white space within the text.
-* 
-* @package Savant3
-* 
-* @author Monte Ohrt <monte@ispi.net>
-* 
-* @author Contributions from Lars Noschinski <lars@usenet.noschinski.de>
-* 
-* @author Converted to a Savant3 filter by Paul M. Jones <pmjones@ciaweb.net>
-* 
-* @license http://www.gnu.org/copyleft/lesser.html LGPL
-* 
-* @version $Id: Savant3_Filter_trimwhitespace.php,v 1.4 2005/05/29 15:27:07 pmjones Exp $
-*
-*/
-
-/**
-* 
-* Filter to remove extra white space within the text.
-* 
-* @package Savant3
-* 
-* @author Monte Ohrt <monte@ispi.net>
-* 
-* @author Contributions from Lars Noschinski <lars@usenet.noschinski.de>
-* 
-* @author Converted to a Savant3 filter by Paul M. Jones <pmjones@ciaweb.net>
-* 
-*/
-
-class Savant3_Filter_trimwhitespace extends Savant3_Filter {
-	
-	
-	/**
-	* 
-	* Removes extra white space within the text.
-	* 
-	* Trim leading white space and blank lines from template source
-	* after it gets interpreted, cleaning up code and saving bandwidth.
-	* Does not affect <pre></pre>, <script></script>, or
-	* <textarea></textarea> blocks.
-	* 
-	* @access public
-	* 
-	* @param string $buffer The source text to be filtered.
-	* 
-	* @return string The filtered text.
-	* 
-	*/
-	
-	public static function filter($buffer)
-	{
-		// Pull out the script blocks
-		preg_match_all("!<script[^>]+>.*?</script>!is", $buffer, $match);
-		$script_blocks = $match[0];
-		$buffer = preg_replace(
-			"!<script[^>]+>.*?</script>!is",
-			'@@@SAVANT:TRIM:SCRIPT@@@',
-			$buffer
-		);
-	
-		// Pull out the pre blocks
-		preg_match_all("!<pre[^>]*>.*?</pre>!is", $buffer, $match);
-		$pre_blocks = $match[0];
-		$buffer = preg_replace(
-			"!<pre[^>]*>.*?</pre>!is",
-			'@@@SAVANT:TRIM:PRE@@@',
-			$buffer
-		);
-	
-		// Pull out the textarea blocks
-		preg_match_all("!<textarea[^>]+>.*?</textarea>!is", $buffer, $match);
-		$textarea_blocks = $match[0];
-		$buffer = preg_replace(
-			"!<textarea[^>]+>.*?</textarea>!is",
-			'@@@SAVANT:TRIM:TEXTAREA@@@',
-			$buffer
-		);
-	
-		// remove all leading spaces, tabs and carriage returns NOT
-		// preceeded by a php close tag.
-		$buffer = trim(preg_replace('/((?<!\?>)\n)[\s]+/m', '\1', $buffer));
-	
-		// replace script blocks
-		Savant3_Filter_trimwhitespace::replace(
-			"@@@SAVANT:TRIM:SCRIPT@@@",
-			$script_blocks,
-			$buffer
-		);
-	
-		// replace pre blocks
-		Savant3_Filter_trimwhitespace::replace(
-			"@@@SAVANT:TRIM:PRE@@@",
-			$pre_blocks,
-			$buffer
-		);
-	
-		// replace textarea blocks
-		Savant3_Filter_trimwhitespace::replace(
-			"@@@SAVANT:TRIM:TEXTAREA@@@",
-			$textarea_blocks,
-			$buffer
-		);
-	
-		return $buffer;
-	}
-	
-	
-	/**
-	* 
-	* Does a simple search-and-replace on the source text.
-	* 
-	* @access protected
-	* 
-	* @param string $search The string to search for.
-	* 
-	* @param string $replace Replace with this text.
-	* 
-	* @param string &$buffer The source text.
-	* 
-	* @return string The text after search-and-replace.
-	* 
-	*/
-	
-	protected static function replace($search, $replace, &$buffer)
-	{
-		$len = strlen($search);
-		$pos = 0;
-		$count = count($replace);
-		
-		for ($i = 0; $i < $count; $i++) {
-			// does the search-string exist in the buffer?
-			$pos = strpos($buffer, $search, $pos);
-			if ($pos !== false) {
-				// replace the search-string
-				$buffer = substr_replace($buffer, $replace[$i], $pos, $len);
-			} else {
-				break;
-			}
-		}
-	}
-}
-?>
\ No newline at end of file
diff --git a/htdocs/includes/savant/Savant3/resources/Savant3_Plugin_ahref.php b/htdocs/includes/savant/Savant3/resources/Savant3_Plugin_ahref.php
deleted file mode 100644
index 6d6bb319bb3..00000000000
--- a/htdocs/includes/savant/Savant3/resources/Savant3_Plugin_ahref.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-/**
-* 
-* Generates an <a href="">...</a> tag.
-* 
-* @package Savant3
-* 
-* @author Paul M. Jones <pmjones@ciaweb.net>
-* 
-* @license http://www.gnu.org/copyleft/lesser.html LGPL
-* 
-* @version $Id: Savant3_Plugin_ahref.php,v 1.4 2005/08/09 12:56:14 pmjones Exp $
-*
-*/
-
-/**
-* 
-* Generates an <a href="">...</a> tag.
-*
-* @package Savant3
-* 
-* @author Paul M. Jones <pmjones@ciaweb.net>
-* 
-*/
-
-class Savant3_Plugin_ahref extends Savant3_Plugin {
-
-	/**
-	* 
-	* Generate an HTML <a href="">...</a> tag.
-	* 
-	* @access public
-	* 
-	* @param string|array $href A string URL for the resulting tag.  May
-	* also be an array with any combination of the keys 'scheme',
-	* 'host', 'path', 'query', and 'fragment' (c.f. PHP's native
-	* parse_url() function).
-	* 
-	* @param string $text The displayed text of the link.
-	* 
-	* @param string|array $attr Any extra attributes for the <a> tag.
-	* 
-	* @return string The <a href="">...</a> tag.
-	* 
-	*/
-	
-	public function ahref($href, $text, $attr = null)
-	{
-		$html = '<a href="';
-		
-		if (is_array($href)) {
-			
-			// add the HREF from an array
-			$tmp = '';
-			
-			if (isset($href['scheme'])) {
-				$tmp .= $href['scheme'] . ':';
-				if (strtolower($href['scheme']) != 'mailto') {
-					$tmp .= '//';
-				}
-			}
-			
-			if (isset($href['host'])) {
-				$tmp .= $href['host'];
-			}
-			
-			if (isset($href['path'])) {
-				$tmp .= $href['path'];
-			}
-			
-			if (isset($href['query'])) {
-				$tmp .= '?' . $href['query'];
-			}
-			
-			if (isset($href['fragment'])) {
-				$tmp .= '#' . $href['fragment'];
-			}
-		
-			$html .= htmlspecialchars($tmp);
-			
-		} else {
-		
-			// add the HREF from a scalar
-			$html .= htmlspecialchars($href);
-			
-		}
-		
-		$html .= '"';
-		
-		// add attributes
-		if (is_array($attr)) {
-			// from array
-			foreach ($attr as $key => $val) {
-				$key = htmlspecialchars($key);
-				$val = htmlspecialchars($val);
-				$html .= " $key=\"$val\"";
-			}
-		} elseif (! is_null($attr)) {
-			// from scalar
-			$html .= htmlspecialchars(" $attr");
-		}
-		
-		// set the link text, close the tag, and return
-		$html .= '>' . $text . '</a>';
-		return $html;
-	}
-}
-?>
\ No newline at end of file
diff --git a/htdocs/includes/savant/Savant3/resources/Savant3_Plugin_date.php b/htdocs/includes/savant/Savant3/resources/Savant3_Plugin_date.php
deleted file mode 100644
index c35db4ca7b6..00000000000
--- a/htdocs/includes/savant/Savant3/resources/Savant3_Plugin_date.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/**
-* 
-* Plugin to generate a formatted date using strftime() conventions.
-* 
-* @package Savant3
-* 
-* @author Paul M. Jones <pmjones@ciaweb.net>
-* 
-* @license http://www.gnu.org/copyleft/lesser.html LGPL
-* 
-* @version $Id: Savant3_Plugin_date.php,v 1.3 2005/03/07 14:40:16 pmjones Exp $
-*
-*/
-
-/**
-* 
-* Plugin to generate a formatted date using strftime() conventions.
-* 
-* @package Savant3
-* 
-* @author Paul M. Jones <pmjones@ciaweb.net>
-* 
-*/
-
-class Savant3_Plugin_date extends Savant3_Plugin {
-	
-	/**
-	* 
-	* The default strftime() format string.
-	* 
-	* @access public
-	* 
-	* @var array
-	* 
-	*/
-	
-	public $default = '%c';
-	
-	
-	/**
-	* 
-	* Custom strftime() format strings to use for dates.
-	* 
-	* You can preset the format strings via Savant3::setPluginConf().
-	* 
-	* <code>
-	* $conf = array(
-	*     'custom' => array(
-	*         'mydate' => '%Y-%m-%d',
-	*         'mytime' => '%R'
-	*     )
-	* );
-	* 
-	* $Savant->setPluginConf('date', $conf);
-	* </code>
-	* 
-	* ... and in your template, to use a preset custom string by name:
-	* 
-	* <code>
-	* echo $this->date($value, 'mydate');
-	* </code>
-	* 
-	* @access public
-	* 
-	* @var array
-	* 
-	*/
-	
-	public $custom = array(
-		'date'    => '%Y-%m-%d',
-		'time'    => '%H:%M:%S'
-	);
-	
-	
-	/**
-	* 
-	* Outputs a formatted date using strftime() conventions.
-	* 
-	* @access public
-	* 
-	* @param string $datestring Any date-time string suitable for
-	* strtotime().
-	* 
-	* @param string $format The strftime() formatting string, or a named
-	* custom string key from $this->custom.
-	* 
-	* @return string The formatted date string.
-	* 
-	*/
-	
-	function date($datestring, $format = null)
-	{
-		settype($format, 'string');
-		
-		if (is_null($format)) {
-			$format = $this->default;
-		}
-		
-		// does the format string have a % sign in it?
-		if (strpos($format, '%') === false) {
-			// no, look for a custom format string
-			if (! empty($this->custom[$format])) {
-				// found a custom format string
-				$format = $this->custom[$format];
-			} else {
-				// did not find the custom format, revert to default
-				$format = $this->default;
-			}
-		}
-		
-		// convert the date string to the specified format
-		if (trim($datestring != '')) {
-			return strftime($format, strtotime($datestring));
-		} else {
-			// no datestring, return VOID
-			return;
-		}
-	}
-
-}
-?>
\ No newline at end of file
diff --git a/htdocs/includes/savant/Savant3/resources/Savant3_Plugin_htmlAttribs.php b/htdocs/includes/savant/Savant3/resources/Savant3_Plugin_htmlAttribs.php
deleted file mode 100644
index 09257f77cf7..00000000000
--- a/htdocs/includes/savant/Savant3/resources/Savant3_Plugin_htmlAttribs.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
-* 
-* Plugin to convert an associative array to a string of tag attributes.
-* 
-* @package Savant3
-* 
-* @author Paul M. Jones <pmjones@ciaweb.net>
-* 
-* @license http://www.gnu.org/copyleft/lesser.html LGPL
-* 
-* @version $Id: Savant3_Plugin_htmlAttribs.php,v 1.3 2005/09/12 17:49:27 pmjones Exp $
-* 
-*/
-
-/**
-* 
-* Plugin to convert an associative array to a string of tag attributes.
-* 
-* @package Savant3
-* 
-* @author Paul M. Jones <pmjones@ciaweb.net>
-* 
-*/
-
-class Savant3_Plugin_htmlAttribs extends Savant3_Plugin {
-
-	/**
-	* 
-	* Converts an associative array to a string of tag attributes.
-	* 
-	* @access public
-	* 
-	* @param array $attribs From this array, each key-value pair is 
-	* converted to an attribute name and value.
-	* 
-	* @return string The XHTML for the attributes.
-	* 
-	*/
-	
-	public function htmlAttribs($attribs)
-	{
-		$xhtml = '';
-		foreach ((array) $attribs as $key => $val) {
-		
-			if ($val === null) {
-				continue;
-			}
-			
-			if (is_array($val)) {
-				$val = implode(' ', $val);
-			}
-			
-			$key = htmlspecialchars($key);
-			$val = htmlspecialchars($val);
-			
-			$xhtml .= " $key=\"$val\"";
-		}
-		return $xhtml;
-	}
-}
-?>
\ No newline at end of file
diff --git a/htdocs/includes/savant/Savant3/resources/Savant3_Plugin_image.php b/htdocs/includes/savant/Savant3/resources/Savant3_Plugin_image.php
deleted file mode 100644
index 4b316e7537c..00000000000
--- a/htdocs/includes/savant/Savant3/resources/Savant3_Plugin_image.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-
-/**
-* 
-* Plugin to generate an <img ... /> tag.
-* 
-* @package Savant3
-* 
-* @author Paul M. Jones <pmjones@ciaweb.net>
-* 
-* @license http://www.gnu.org/copyleft/lesser.html LGPL
-* 
-* @version $Id: Savant3_Plugin_image.php,v 1.7 2005/08/12 14:34:09 pmjones Exp $
-*
-*/
-
-/**
-* 
-* Plugin to generate an <img ... /> tag.
-*
-* Support for alpha transparency of PNG files in Microsoft IE added by
-* Edward Ritter; thanks, Edward.
-* 
-* @package Savant3
-* 
-* @author Paul M. Jones <pmjones@ciaweb.net>
-* 
-*/
-
-class Savant3_Plugin_image extends Savant3_Plugin {
-	
-	
-	/**
-	* 
-	* The document root.
-	* 
-	* @access public
-	* 
-	* @var string
-	* 
-	*/
-	
-	protected $documentRoot = null;
-	
-	
-	/**
-	* 
-	* The base directory for images within the document root.
-	* 
-	* @access public
-	* 
-	* @var string
-	* 
-	*/
-	
-	protected $imageDir = null;
-	
-	
-	/**
-	* 
-	* Outputs an <img ... /> tag.
-	* 
-	* Microsoft IE alpha PNG support added by Edward Ritter.
-	* 
-	* @access public
-	* 
-	* @param string $file The path to the image on the local file system
-	* relative to $this->imageDir.
-	* 
-	* @param string $alt Alternative descriptive text for the image;
-	* defaults to the filename of the image.
-	* 
-	* @param int $border The border width for the image; defaults to zero.
-	* 
-	* @param int $width The displayed image width in pixels; defaults to
-	* the width of the image.
-	* 
-	* @param int $height The displayed image height in pixels; defaults to
-	* the height of the image.
-	* 
-	* @return string An <img ... /> tag.
-	* 
-	*/
-	
-	public function image($file, $alt = null, $height = null, $width = null,
-		$attr = null)
-	{
-		// is the document root set?
-		if (is_null($this->documentRoot) && isset($_SERVER['DOCUMENT_ROOT'])) {
-			// no, so set it
-			$this->documentRoot = $_SERVER['DOCUMENT_ROOT'];
-		}
-		
-		// make sure there's a DIRECTORY_SEPARATOR between the docroot
-		// and the image dir
-		if (substr($this->documentRoot, -1) != DIRECTORY_SEPARATOR &&
-			substr($this->imageDir, 0, 1) != DIRECTORY_SEPARATOR) {
-			$this->documentRoot .= DIRECTORY_SEPARATOR;
-		}
-		
-		// make sure there's a separator between the imageDir and the
-		// file name
-		if (substr($this->imageDir, -1) != DIRECTORY_SEPARATOR &&
-			substr($file, 0, 1) != DIRECTORY_SEPARATOR) {
-			$this->imageDir .= DIRECTORY_SEPARATOR;
-		}
-		
-		// the image file type code (PNG = 3)
-		$type = null;
-		
-		// get the file information
-		$info = false;
-		
-		if (strpos($file, '://') === false) {
-			// no "://" in the file, so it's local
-			$file = $this->imageDir . $file;
-			$tmp = $this->documentRoot . $file;
-			$info = @getimagesize($tmp);
-		} else {
-			// don't attempt to get file info from streams, it takes
-			// way too long.
-			$info = false;
-		}
-		
-		// did we find the file info?
-		if (is_array($info)) {
-		
-			// capture type info regardless
-			$type = $info[2];
-			
-			// capture size info where both not specified
-			if (is_null($width) && is_null($height)) {
-				$width = $info[0];
-				$height = $info[1];
-			}
-		}
-		
-		// clean up
-		unset($info);
-		
-		// is the file a PNG? if so, check user agent, we will need to
-		// make special allowances for Microsoft IE.
-		if (stristr($_SERVER['HTTP_USER_AGENT'], 'MSIE') && $type === 3) {
-			
-			// support alpha transparency for PNG files in MSIE
-			$html = '<span style="position: relative;';
-			
-			if ($height) {
-				$html .= ' height: ' . $height . 'px;';
-			}
-			
-			if ($width) {
-				$html .= ' width: ' . $width . 'px;';
-			}
-			
-			$html .= ' filter:progid:DXImageTransform.Microsoft.AlphaImageLoader';
-			$html .= "(src='" . htmlspecialchars($file) . "',sizingMethod='scale');\"";
-			$html .= ' title="' . htmlspecialchars($alt) . '"';
-			
-			$html .= $this->Savant->htmlAttribs($attr);
-
-			// done
-			$html .= '></span>';
-			
-		} else {
-			
-			// not IE, so build a normal image tag.
-			$html = '<img';
-			$html .= ' src="' . htmlspecialchars($file) . '"';
-			
-			// add the alt attribute
-			if (is_null($alt)) {
-				$alt = basename($file);
-			}
-			$html .= ' alt="' . htmlspecialchars($alt) . '"';
-			
-			// add the height attribute
-			if ($height) {
-				$html .= ' height="' . htmlspecialchars($height) . '"';
-			}
-			
-			// add the width attribute
-			if ($width) {
-				$html .= ' width="' . htmlspecialchars($width) . '"';
-			}
-			
-			$html .= $this->Savant->htmlAttribs($attr);
-			
-			// done
-			$html .= ' />';
-			
-		}
-		
-		// done!
-		return $html;
-	}
-}
-
-?>
\ No newline at end of file

From a177853299e92f3eac71cced8ce0bd3e46767e82 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Mon, 28 Jan 2013 20:30:33 +0100
Subject: [PATCH 051/162] =?UTF-8?q?Fix:=20la=20b=C3=A9tise=20n'a=20pas=20d?=
 =?UTF-8?q?e=20limite=20!=20restons=20archa=C3=AFque.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/main.inc.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 2695a2fd3d0..f7081340f8a 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -675,14 +675,6 @@ if (! defined('NOREQUIRETRAN'))
     }
 }
 
-// Use php template engine
-if (! empty($conf->global->MAIN_USE_TEMPLATE_ENGINE) && ! defined('NOTEMPLATEENGINE'))
-{
-	require_once DOL_DOCUMENT_ROOT.'/includes/savant/Savant3.php';
-
-	$tpl = new Savant3();
-}
-
 // Case forcing style from url
 if (GETPOST('theme'))
 {
@@ -832,7 +824,7 @@ if (! function_exists("llxHeader"))
 	function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='')
 	{
 	    global $conf;
-		
+
 	    // html header
 		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
@@ -845,7 +837,7 @@ if (! function_exists("llxHeader"))
 		{
 			left_menu('', $help_url, '', '', 1, $title);
 		}
-		
+
 		// main area
 		main_area($title);
 	}

From 180fb2c91a66a4cf3b9f901be827fefa55be576f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Jan 2013 15:22:07 +0100
Subject: [PATCH 052/162] Fix: Option COMPANY_USE_SEARCH_TO_SELECT was not
 working for third party selection when autocomplete is on.

---
 htdocs/core/class/html.form.class.php | 17 +++++++++++++++--
 htdocs/core/js/lib_head.js            |  8 +++++++-
 htdocs/core/lib/ajax.lib.php          |  3 ++-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index e71a0f6eafe..f31cb0f741e 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -688,8 +688,21 @@ class Form
             if ($conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT && ! $forcecombo)
             {
                 //$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2);
-
-                $out.= ajax_combobox($htmlname, $event);
+                $out.= ajax_combobox($htmlname, $event, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
+				/*              
+				if ($selected && empty($selected_input_value))
+                {
+                	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+                	$product = new Product($this->db);
+                	$product->fetch($selected);
+                	$selected_input_value=$product->ref;
+                }
+                // mode=1 means customers products
+                $ajaxoptions=array();
+                $urloption='htmlname='.$htmlname.'&outjson=1&filter='.urlencode($filter).'&showtype='.$showtype;
+				$out.=ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
+                $out.='<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'" />';
+				*/
             }
 
             $out.= '<select id="'.$htmlname.'" class="flat" name="'.$htmlname.'">';
diff --git a/htdocs/core/js/lib_head.js b/htdocs/core/js/lib_head.js
index 0a0547bf6f3..ba2df7195f8 100644
--- a/htdocs/core/js/lib_head.js
+++ b/htdocs/core/js/lib_head.js
@@ -771,7 +771,11 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
  */
 (function( $ ) {
 	$.widget( "ui.combobox", {
+		options: {
+			minLengthToAutocomplete: 0,
+		},
         _create: function() {
+        	var savMinLengthToAutocomplete = this.options.minLengthToAutocomplete;
             var self = this,
                 select = this.element.hide(),
                 selected = select.children( ":selected" ),
@@ -781,7 +785,7 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
                 .val( value )
                 .autocomplete({
                     delay: 0,
-                    minLength: 0,
+                    minLength: this.options.minLengthToAutocomplete,
                     source: function( request, response ) {
                         var matcher = new RegExp( $.ui.autocomplete.escapeRegex(request.term), "i" );
                         response( select.children( "option" ).map(function() {
@@ -854,7 +858,9 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
                     }
 
                     // pass empty string as value to search for, displaying all results
+                    input.autocomplete({ minLength: 0 });
                     input.autocomplete( "search", "" );
+                    input.autocomplete({ minLength: savMinLengthToAutocomplete });
                     input.focus();
                 });
         },
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 8662830a3c4..4f7beb5356b 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -303,11 +303,12 @@ function ajax_dialog($title,$message,$w=350,$h=150)
  * 	@param	array	$event			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
  *  @return	string					Return html string to convert a select field into a combo
  */
-function ajax_combobox($htmlname, $event=array())
+function ajax_combobox($htmlname, $event=array(), $minLengthToAutocomplete=0)
 {
 	$msg = '<script type="text/javascript">
     $(function() {
     	$("#'.$htmlname.'").combobox({
+    		minLengthToAutocomplete : '.$minLengthToAutocomplete.',
     		selected : function(event,ui) {
     			var obj = '.json_encode($event).';
     			$.each(obj, function(key,values) {

From 30764a6c00b1785923b7184a6db826f3588d1472 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 29 Jan 2013 15:22:07 +0100
Subject: [PATCH 053/162] Fix: Option COMPANY_USE_SEARCH_TO_SELECT was not
 working for third party selection when autocomplete is on.

---
 htdocs/core/class/html.form.class.php | 17 +++++++++++++++--
 htdocs/core/js/lib_head.js            |  8 +++++++-
 htdocs/core/lib/ajax.lib.php          |  3 ++-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 6e331bc0a0e..e28027c4aeb 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -689,8 +689,21 @@ class Form
             if ($conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT && ! $forcecombo)
             {
                 //$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2);
-
-                $out.= ajax_combobox($htmlname, $event);
+                $out.= ajax_combobox($htmlname, $event, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
+				/*              
+				if ($selected && empty($selected_input_value))
+                {
+                	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+                	$product = new Product($this->db);
+                	$product->fetch($selected);
+                	$selected_input_value=$product->ref;
+                }
+                // mode=1 means customers products
+                $ajaxoptions=array();
+                $urloption='htmlname='.$htmlname.'&outjson=1&filter='.urlencode($filter).'&showtype='.$showtype;
+				$out.=ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
+                $out.='<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'" />';
+				*/
             }
 
             $out.= '<select id="'.$htmlname.'" class="flat" name="'.$htmlname.'">';
diff --git a/htdocs/core/js/lib_head.js b/htdocs/core/js/lib_head.js
index 0a0547bf6f3..ba2df7195f8 100644
--- a/htdocs/core/js/lib_head.js
+++ b/htdocs/core/js/lib_head.js
@@ -771,7 +771,11 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
  */
 (function( $ ) {
 	$.widget( "ui.combobox", {
+		options: {
+			minLengthToAutocomplete: 0,
+		},
         _create: function() {
+        	var savMinLengthToAutocomplete = this.options.minLengthToAutocomplete;
             var self = this,
                 select = this.element.hide(),
                 selected = select.children( ":selected" ),
@@ -781,7 +785,7 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
                 .val( value )
                 .autocomplete({
                     delay: 0,
-                    minLength: 0,
+                    minLength: this.options.minLengthToAutocomplete,
                     source: function( request, response ) {
                         var matcher = new RegExp( $.ui.autocomplete.escapeRegex(request.term), "i" );
                         response( select.children( "option" ).map(function() {
@@ -854,7 +858,9 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
                     }
 
                     // pass empty string as value to search for, displaying all results
+                    input.autocomplete({ minLength: 0 });
                     input.autocomplete( "search", "" );
+                    input.autocomplete({ minLength: savMinLengthToAutocomplete });
                     input.focus();
                 });
         },
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 8662830a3c4..4f7beb5356b 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -303,11 +303,12 @@ function ajax_dialog($title,$message,$w=350,$h=150)
  * 	@param	array	$event			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
  *  @return	string					Return html string to convert a select field into a combo
  */
-function ajax_combobox($htmlname, $event=array())
+function ajax_combobox($htmlname, $event=array(), $minLengthToAutocomplete=0)
 {
 	$msg = '<script type="text/javascript">
     $(function() {
     	$("#'.$htmlname.'").combobox({
+    		minLengthToAutocomplete : '.$minLengthToAutocomplete.',
     		selected : function(event,ui) {
     			var obj = '.json_encode($event).';
     			$.each(obj, function(key,values) {

From 96efa8770826ff2fc82df0e91da6d33a10454ef2 Mon Sep 17 00:00:00 2001
From: fhenry <florian.henry@open-concept.pro>
Date: Tue, 29 Jan 2013 20:05:08 +0100
Subject: [PATCH 054/162] Fix bug "A user can always read its own card" false
 today for external user even if user get right to change his won info

---
 htdocs/user/fiche.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 222ab62b846..d260e8b4f60 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -72,7 +72,9 @@ $socid=0;
 if ($user->societe_id > 0) $socid = $user->societe_id;
 $feature2='user';
 if ($user->id == $id) { $feature2=''; $canreaduser=1; } // A user can always read its own card
-$result = restrictedArea($user, 'user', $id, '&user', $feature2);
+if (!$canreaduser) {
+	$result = restrictedArea($user, 'user', $id, '&user', $feature2);
+}
 if ($user->id <> $id && ! $canreaduser) accessforbidden();
 
 $langs->load("users");

From 7ee530f826cc25086067299d5253df65d82daa36 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 30 Jan 2013 15:23:49 +0100
Subject: [PATCH 055/162] New: Add field to store hierarchy of users.

---
 htdocs/install/mysql/migration/3.3.0-3.4.0.sql | 2 ++
 htdocs/install/mysql/tables/llx_user.sql       | 1 +
 2 files changed, 3 insertions(+)

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 fd779495e3e..0a5a4a94642 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
@@ -31,3 +31,5 @@ UPDATE llx_const set value='auguria_menu.php' where value='auguria_frontoffice.p
 UPDATE llx_const set value='smartphone_menu.php' where value='smartphone_backoffice.php';
 UPDATE llx_const set value='smartphone_menu.php' where value='smartphone_frontoffice.php';
 
+ALTER TABLE llx_user add COLUMN fk_user integer;
+
diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
index bc4d75f0869..3974096085f 100644
--- a/htdocs/install/mysql/tables/llx_user.sql
+++ b/htdocs/install/mysql/tables/llx_user.sql
@@ -50,6 +50,7 @@ create table llx_user
   fk_societe        integer,
   fk_socpeople      integer,
   fk_member         integer,
+  fk_user           integer,               -- Hierarchic parent
   note              text DEFAULT NULL,
   datelastlogin     datetime,
   datepreviouslogin datetime,

From faccc978b4c395bd1f75b8f50dc43f6661ec207a Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <mko@atm-consulting.fr>
Date: Wed, 30 Jan 2013 16:50:28 +0100
Subject: [PATCH 056/162] LDAP : start implementing user update function after
 LDAP connexion

---
 htdocs/core/login/functions_ldap.php |  6 +++++-
 htdocs/user/class/user.class.php     | 30 +++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index 37e55e62e71..b0239a80d96 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -148,6 +148,8 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)
 				// ldap2dolibarr synchronisation
 				if ($login && ! empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')
 				{
+					dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr");
+
 					// On charge les attributs du user ldap
 					if ($ldapdebug) print "DEBUG: login ldap = ".$login."<br>\n";
 					$resultFetchLdapUser = $ldap->fetch($login,$userSearchFilter);
@@ -164,6 +166,7 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)
 					$resultFetchUser=$user->fetch('',$login,$sid);
 					if ($resultFetchUser > 0)
 					{
+						dol_syslog("functions_ldap::check_user_password_ldap Sync user found id=".$user->id);
 						// On verifie si le login a change et on met a jour les attributs dolibarr
 						if ($user->login != $ldap->login && $ldap->login)
 						{
@@ -171,7 +174,8 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)
 							$user->update($user);
 							// TODO Que faire si update echoue car on update avec un login deja existant.
 						}
-						//$resultUpdate = $user->update_ldap2dolibarr();
+						
+						$resultUpdate = $user->update_ldap2dolibarr($ldap);
 					}
 				}
 			}
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index daf7b7ade4c..52472297eb2 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1153,7 +1153,7 @@ class User extends CommonObject
 				{
 					// Si mot de passe saisi et different de celui en base
 					$result=$this->setPassword($user,$this->pass,0,$notrigger,$nosyncmemberpass);
-					if (! $nbrowsaffected) $nbrowsaffected++;
+					if (! $nbrowsaffected) $nbrowsaffected++; 
 				}
 			}
 
@@ -2072,6 +2072,34 @@ class User extends CommonObject
 		}
 	}
 
+	/**
+	 * Update user using data from the LDAP
+	 * // TODO: Voir pourquoi le update met à jour avec toutes les valeurs vide (global $user écrase ?)
+	 */
+	function update_ldap2dolibarr(&$ldapuser) {
+		global $user, $conf;
+
+		$this->firstname=$ldapuser->{$conf->global->LDAP_FIELD_FIRSTNAME};
+		$this->lastname=$ldapuser->{$conf->global->LDAP_FIELD_NAME};
+		$this->login=$ldapuser->{$conf->global->LDAP_FIELD_LOGIN};
+		$this->pass=$ldapuser->{$conf->global->LDAP_FIELD_PASSWORD};
+		$this->pass_indatabase_crypted=$ldapuser->{$conf->global->LDAP_FIELD_PASSWORD_CRYPTED};
+
+		$this->office_phone=$ldapuser->{$conf->global->LDAP_FIELD_PHONE};
+		$this->user_mobile=$ldapuser->{$conf->global->LDAP_FIELD_MOBILE};
+		$this->office_fax=$ldapuser->{$conf->global->LDAP_FIELD_FAX};
+		$this->email=$ldapuser->{$conf->global->LDAP_FIELD_MAIL};
+		$this->ldap_sid=$ldapuser->{$conf->global->LDAP_FIELD_SID};
+
+		$this->job=$ldapuser->{$conf->global->LDAP_FIELD_TITLE};
+		$this->note=$ldapuser->{$conf->global->LDAP_FIELD_DESCRIPTION};
+		
+		$result = $this->update($user);
+		
+		dol_syslog(get_class($this)."::update_ldap2dolibarr result=".$result, LOG_DEBUG);
+		
+		return $result;
+	}
 }
 
 ?>

From 51800a0dd58181c3362e56b7e99c231ad7691ade Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <mko@atm-consulting.fr>
Date: Wed, 30 Jan 2013 16:52:33 +0100
Subject: [PATCH 057/162] Security : add phtml extension to be dealed as php
 extension

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

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index b480184808f..290ce015543 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -264,6 +264,7 @@ function dol_mimetype($file,$default='application/octet-stream',$mode=0)
     if (preg_match('/\.(h)$/i',$tmpfile))                      { $mime='text/plain'; $imgmime='text.png'; $srclang='h'; }
     if (preg_match('/\.(java|jsp)$/i',$tmpfile))               { $mime='text/plain'; $imgmime='text.png'; $srclang='java'; }
 	if (preg_match('/\.php([0-9]{1})?$/i',$tmpfile))           { $mime='text/plain'; $imgmime='php.png'; $srclang='php'; }
+	if (preg_match('/\.phtml$/i',$tmpfile))                    { $mime='text/plain'; $imgmime='php.png'; $srclang='php'; }
 	if (preg_match('/\.(pl|pm)$/i',$tmpfile))                  { $mime='text/plain'; $imgmime='pl.png'; $srclang='perl'; }
 	if (preg_match('/\.sql$/i',$tmpfile))                      { $mime='text/plain'; $imgmime='text.png'; $srclang='sql'; }
 	if (preg_match('/\.js$/i',$tmpfile))                       { $mime='text/x-javascript'; $imgmime='jscript.png'; $srclang='js'; }

From da066badc8c7700a8bec6f3f08df09a61e9710c0 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <mko@atm-consulting.fr>
Date: Wed, 30 Jan 2013 16:53:59 +0100
Subject: [PATCH 058/162] LDAP : no user update for the moment, dev for
 updating user from ldap is not working yet

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

diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index b0239a80d96..b9c5d89a72e 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -175,7 +175,7 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)
 							// TODO Que faire si update echoue car on update avec un login deja existant.
 						}
 						
-						$resultUpdate = $user->update_ldap2dolibarr($ldap);
+						//$resultUpdate = $user->update_ldap2dolibarr($ldap);
 					}
 				}
 			}

From 66376f1c83351eab88218397c315df3988308042 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <mko@atm-consulting.fr>
Date: Thu, 31 Jan 2013 09:56:52 +0100
Subject: [PATCH 059/162] Bug # 701 : A user can only be set admin by an admin

---
 htdocs/user/fiche.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index e274c9bf1a0..92ebb740523 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -324,7 +324,9 @@ if ($action == 'update' && ! $_POST["cancel"])
             $object->firstname	= GETPOST("prenom");
             $object->login		= GETPOST("login");
             $object->pass		= GETPOST("password");
-            $object->admin		= GETPOST("admin");
+			if($user->admin == 1) { // A user can only be set admin by an admin
+            	$object->admin = GETPOST("admin");
+			}
             $object->office_phone=GETPOST("office_phone");
             $object->office_fax	= GETPOST("office_fax");
             $object->user_mobile= GETPOST("user_mobile");

From 26c66a11ed96780e6f6e7246689ac05e95acf16e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 31 Jan 2013 10:21:34 +0100
Subject: [PATCH 060/162] Fix: Bug 701

---
 htdocs/user/fiche.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index d260e8b4f60..660b9fe1cfb 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -326,7 +326,7 @@ if ($action == 'update' && ! $_POST["cancel"])
             $object->firstname	= GETPOST("prenom");
             $object->login		= GETPOST("login");
             $object->pass		= GETPOST("password");
-            $object->admin		= GETPOST("admin");
+            $object->admin		= empty($user->admin)?0:GETPOST("admin"); // A user can only be set admin by an admin
             $object->office_phone=GETPOST("office_phone");
             $object->office_fax	= GETPOST("office_fax");
             $object->user_mobile= GETPOST("user_mobile");

From 7134ab55948fdb5c4f984aa1d3841ab251f5edd3 Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Fri, 1 Feb 2013 09:28:02 +0100
Subject: [PATCH 061/162] Trad: Add missing translations

---
 htdocs/langs/ca_ES/categories.lang | 6 +++++-
 htdocs/langs/en_US/categories.lang | 6 +++++-
 htdocs/langs/es_ES/categories.lang | 6 +++++-
 htdocs/langs/fr_FR/categories.lang | 6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang
index 9c83c8c9ff7..8d541125ae3 100644
--- a/htdocs/langs/ca_ES/categories.lang
+++ b/htdocs/langs/ca_ES/categories.lang
@@ -90,4 +90,8 @@ CategId=Id categoria
 CatSupList=Llista de categories de proveïdors
 CatCusList=Llista de categories de clients/potencials
 CatProdList=Llista de categories de productes
-CatMemberList=Llista de categories de membres
\ No newline at end of file
+CatMemberList=Llista de categories de membres
+# Imports
+CatProdLinks=Productes
+CatCusLinks=Clients/Clients potencials
+CatSupLinks=Proveïdors
\ No newline at end of file
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index 60267629de5..da1fd9fe147 100644
--- a/htdocs/langs/en_US/categories.lang
+++ b/htdocs/langs/en_US/categories.lang
@@ -95,4 +95,8 @@ CatMemberList=List of members categories
 CatSupLinks=Links between suppliers and categories
 CatCusLinks=Links between customers/prospects and categories
 CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
\ No newline at end of file
+CatMemberLinks=Links between members and categories
+# Imports
+CatProdLinks=Products
+CatCusLinks=Customer/Prospects
+CatSupLinks=Suppliers
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang
index b23acbb0ccf..7521b9c03dc 100644
--- a/htdocs/langs/es_ES/categories.lang
+++ b/htdocs/langs/es_ES/categories.lang
@@ -90,4 +90,8 @@ CategId=Id categoría
 CatSupList=Listado categorías de proveedores
 CatCusList=Listado categorías de clientes/potenciales
 CatProdList=Listado categorías de productos
-CatMemberList=Listado categorías de miembros
\ No newline at end of file
+CatMemberList=Listado categorías de miembros
+# Imports
+CatProdLinks=Productos
+CatCusLinks=Clientes/Clientes potenciales
+CatSupLinks=Proveedores
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index f0d0b515e80..49043d2e1a2 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -95,4 +95,8 @@ CatMemberList=Liste des catégories adhérents
 CatSupLinks=Liens entre les fournisseurs et les catégories
 CatCusLinks=Liens entre les clients/prospects et les catégories
 CatProdLinks=Liens entre les produits/services et les catégories
-CatMemberLinks=Links entre les adhérents et les catégories
\ No newline at end of file
+CatMemberLinks=Links entre les adhérents et les catégories
+# Imports
+CatProdLinks=Produits
+CatCusLinks=Clients/Prospects
+CatSupLinks=Fournisseurs
\ No newline at end of file

From 9f7a06e04d0ffa8a1846cfd5de54049740571592 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Feb 2013 09:56:45 +0100
Subject: [PATCH 062/162] Fix: Test not complete

---
 htdocs/holiday/common.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/holiday/common.inc.php b/htdocs/holiday/common.inc.php
index 48e189e2599..95a6e0ee056 100644
--- a/htdocs/holiday/common.inc.php
+++ b/htdocs/holiday/common.inc.php
@@ -50,7 +50,7 @@ $sql.= " WHERE name = 'userGroup'";
 $result = $db->query($sql);
 $obj = $db->fetch_object($result);
 
-if ($obj->value == null)
+if ($obj->value == null || $obj->value < 0)
 {
     llxHeader('',$langs->trans('CPTitreMenu'));
 

From 72c5652a4a5fee38b11e26dd52712ad588a79359 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Feb 2013 10:13:42 +0100
Subject: [PATCH 063/162] Fix: Holiday module update always done

---
 htdocs/holiday/class/holiday.class.php | 70 +++++++++++++++-----------
 htdocs/holiday/index.php               |  3 ++
 2 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 540773d7da2..34b26421a08 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -32,14 +32,14 @@ class Holiday extends CommonObject
 {
 	public $element='holiday';
 	public $table_element='holiday';
-	
+
 	var $db;
     var $error;
     var $errors=array();
 
     var $rowid;
     var $ref;
-    
+
     var $fk_user;
     var $date_create='';
     var $description;
@@ -72,16 +72,24 @@ class Holiday extends CommonObject
     function __construct($db)
     {
         $this->db = $db;
-
-        // Mets à jour les congés payés en début de mois
-        $this->updateSoldeCP();
-
-        // Vérifie le nombre d'utilisateur et mets à jour si besoin
-        $this->verifNbUsers($this->countActiveUsers(),$this->getConfCP('nbUser'));
-        return 1;
     }
 
 
+    /**
+     * updateSold
+     *
+     * @return	int			Return 1
+     */
+    function updateSold()
+    {
+	    // Mets à jour les congés payés en début de mois
+	    $this->updateSoldeCP();
+
+	    // Vérifie le nombre d'utilisateur et mets à jour si besoin
+	    $this->verifNbUsers($this->countActiveUsers(),$this->getConfCP('nbUser'));
+	    return 1;
+    }
+
     /**
      *   Créer un congés payés dans la base de données
      *
@@ -358,10 +366,10 @@ class Holiday extends CommonObject
 
         $sql.= " uu.name as user_lastname,";
         $sql.= " uu.firstname as user_firstname,";
-        
+
         $sql.= " ua.name 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";
         $sql.= " WHERE cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
 
@@ -415,10 +423,10 @@ class Holiday extends CommonObject
 
                 $tab_result[$i]['user_firstname'] = $obj->user_firstname;
                 $tab_result[$i]['user_lastname'] = $obj->user_lastname;
-                
+
                 $tab_result[$i]['validator_firstname'] = $obj->validator_firstname;
                 $tab_result[$i]['validator_lastname'] = $obj->validator_lastname;
-                
+
                 $i++;
             }
             // Retourne 1 et ajoute le tableau à la variable
@@ -601,13 +609,13 @@ class Holiday extends CommonObject
     {
         $this->fetchByUser($fk_user,'','');
 
-        foreach($this->holiday as $infos_CP) 
+        foreach($this->holiday as $infos_CP)
         {
         	if ($infos_CP['statut'] == 4) continue;		// ignore not validated holidays
         	if ($infos_CP['statut'] == 5) continue;		// ignore not validated holidays
-        	     
+
         	// TODO Also use halfday for the check
-            if ($dateDebut >= $infos_CP['date_debut'] && $dateDebut <= $infos_CP['date_fin'] || $dateFin <= $infos_CP['date_fin'] && $dateFin >= $infos_CP['date_debut']) 
+            if ($dateDebut >= $infos_CP['date_debut'] && $dateDebut <= $infos_CP['date_fin'] || $dateFin <= $infos_CP['date_fin'] && $dateFin >= $infos_CP['date_debut'])
             {
                 return false;
             }
@@ -627,23 +635,23 @@ class Holiday extends CommonObject
     function getNomUrl($withpicto=0)
     {
     	global $langs;
-    
+
     	$result='';
-    
+
     	$lien = '<a href="'.DOL_URL_ROOT.'/holiday/fiche.php?id='.$this->id.'">';
     	$lienfin='</a>';
-    
+
     	$picto='holiday';
-    
+
     	$label=$langs->trans("Show").': '.$this->ref;
-    
+
     	if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin);
     	if ($withpicto && $withpicto != 2) $result.=' ';
     	if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin;
     	return $result;
     }
 
-    
+
     /**
      *	Returns the label status
      *
@@ -654,7 +662,7 @@ class Holiday extends CommonObject
     {
     	return $this->LibStatut($this->statut, $mode, $this->date_debut);
     }
-    
+
 	/**
 	 *	Returns the label of a statut
 	 *
@@ -678,7 +686,7 @@ class Holiday extends CommonObject
 		if ($mode == 2)
 		{
 			$pictoapproved='statut6';
-			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4'; 
+			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
 			if ($statut == 1) return img_picto($langs->trans('DraftCP'),'statut0').' '.$langs->trans('DraftCP');				// Draft
 			if ($statut == 2) return img_picto($langs->trans('ToValidateCP'),'statut1').' '.$langs->trans('ToValidateCP');		// Waiting approval
 			if ($statut == 3) return img_picto($langs->trans('ValidateCP'),$pictoapproved).' '.$langs->trans('ValidateCP');
@@ -688,18 +696,18 @@ class Holiday extends CommonObject
 		if ($mode == 5)
 		{
 			$pictoapproved='statut6';
-			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4'; 
+			if (! empty($startdate) && $startdate > dol_now()) $pictoapproved='statut4';
 			if ($statut == 1) return $langs->trans('DraftCP').' '.img_picto($langs->trans('DraftCP'),'statut0');				// Draft
 			if ($statut == 2) return $langs->trans('ToValidateCP').' '.img_picto($langs->trans('ToValidateCP'),'statut1');		// Waiting approval
 			if ($statut == 3) return $langs->trans('ValidateCP').' '.img_picto($langs->trans('ValidateCP'),$pictoapproved);
 			if ($statut == 4) return $langs->trans('CancelCP').' '.img_picto($langs->trans('CancelCP'),'statut5');
 			if ($statut == 5) return $langs->trans('RefuseCP').' '.img_picto($langs->trans('RefuseCP'),'statut5');
 		}
-		
+
 		return $statut;
     }
 
-    
+
     /**
      *   Affiche un select HTML des statuts de congés payés
      *
@@ -857,19 +865,21 @@ class Holiday extends CommonObject
         {
             // Si mise à jour pour tout le monde en début de mois
 			$now=dol_now();
-			
+
             // Mois actuel
             $month = date('m',$now);
             $lastUpdate = $this->getConfCP('lastUpdate');
-            $monthLastUpdate = date('m', $lastUpdate);
+            $monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
+			//print 'month: '.$month.' '.$lastUpdate.' '.$monthLastUpdate;
 
             // Si la date du mois n'est pas la même que celle sauvegardée, on met à jour le timestamp
             if ($month != $monthLastUpdate)
             {
                 $sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
-                $sql.= " value = '".$this->db->idate($now)."'";
+                $sql.= " value = '".dol_print_date($now,'%Y%m%d%H%M%S')."'";
                 $sql.= " WHERE name = 'lastUpdate'";
 
+                dol_syslog(get_class($this).'::updateSoldeCP sql='.$sql);
                 $result = $this->db->query($sql);
 
                 // On ajoute x jours à chaque utilisateurs
diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php
index b6eb71cdccb..4dbb299a825 100644
--- a/htdocs/holiday/index.php
+++ b/htdocs/holiday/index.php
@@ -73,6 +73,9 @@ $search_statut   = GETPOST('select_statut');
 $holiday = new Holiday($db);
 $holidaystatic=new Holiday($db);
 
+// Update sold
+$holiday->updateSold();
+
 $max_year = 5;
 $min_year = 10;
 $filter='';

From 1e74ac24abf5b939a451818a97cf5986776d8596 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Feb 2013 17:34:19 +0100
Subject: [PATCH 064/162] Move message at bottom.

---
 htdocs/admin/modules.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 31fc3a23788..889324807a0 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -265,8 +265,6 @@ $head[$h][2] = 'marketplace';
 $h++;
 
 
-// Show warning about external users
-print showModulesExludedForExternal($modules).'<br>'."\n";
 print "<br>\n";
 
 
@@ -500,6 +498,10 @@ else
 dol_fiche_end();
 
 
+// Show warning about external users
+print showModulesExludedForExternal($modules).'<br>'."\n";
+
+
 llxFooter();
 
 $db->close();

From a9de14c14591453acceebe0e1fc8d3b0d9a4b5a5 Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Fri, 1 Feb 2013 09:28:02 +0100
Subject: [PATCH 065/162] Trad: Add missing translations

---
 htdocs/langs/ca_ES/categories.lang | 6 +++++-
 htdocs/langs/en_US/categories.lang | 6 +++++-
 htdocs/langs/es_ES/categories.lang | 6 +++++-
 htdocs/langs/fr_FR/categories.lang | 6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang
index 9c83c8c9ff7..8d541125ae3 100644
--- a/htdocs/langs/ca_ES/categories.lang
+++ b/htdocs/langs/ca_ES/categories.lang
@@ -90,4 +90,8 @@ CategId=Id categoria
 CatSupList=Llista de categories de proveïdors
 CatCusList=Llista de categories de clients/potencials
 CatProdList=Llista de categories de productes
-CatMemberList=Llista de categories de membres
\ No newline at end of file
+CatMemberList=Llista de categories de membres
+# Imports
+CatProdLinks=Productes
+CatCusLinks=Clients/Clients potencials
+CatSupLinks=Proveïdors
\ No newline at end of file
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index 60267629de5..da1fd9fe147 100644
--- a/htdocs/langs/en_US/categories.lang
+++ b/htdocs/langs/en_US/categories.lang
@@ -95,4 +95,8 @@ CatMemberList=List of members categories
 CatSupLinks=Links between suppliers and categories
 CatCusLinks=Links between customers/prospects and categories
 CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
\ No newline at end of file
+CatMemberLinks=Links between members and categories
+# Imports
+CatProdLinks=Products
+CatCusLinks=Customer/Prospects
+CatSupLinks=Suppliers
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang
index b23acbb0ccf..7521b9c03dc 100644
--- a/htdocs/langs/es_ES/categories.lang
+++ b/htdocs/langs/es_ES/categories.lang
@@ -90,4 +90,8 @@ CategId=Id categoría
 CatSupList=Listado categorías de proveedores
 CatCusList=Listado categorías de clientes/potenciales
 CatProdList=Listado categorías de productos
-CatMemberList=Listado categorías de miembros
\ No newline at end of file
+CatMemberList=Listado categorías de miembros
+# Imports
+CatProdLinks=Productos
+CatCusLinks=Clientes/Clientes potenciales
+CatSupLinks=Proveedores
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index f0d0b515e80..49043d2e1a2 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -95,4 +95,8 @@ CatMemberList=Liste des catégories adhérents
 CatSupLinks=Liens entre les fournisseurs et les catégories
 CatCusLinks=Liens entre les clients/prospects et les catégories
 CatProdLinks=Liens entre les produits/services et les catégories
-CatMemberLinks=Links entre les adhérents et les catégories
\ No newline at end of file
+CatMemberLinks=Links entre les adhérents et les catégories
+# Imports
+CatProdLinks=Produits
+CatCusLinks=Clients/Prospects
+CatSupLinks=Fournisseurs
\ No newline at end of file

From ad91eab0ac11d2e404b319112592e26a8dd9d63a Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Sat, 2 Feb 2013 18:31:45 +0100
Subject: [PATCH 066/162] [ task #652 ] Reduce clicks into creaton of orders,
 invoices, etc. Uniformize propal code (not use addpropal.php)

---
 htdocs/comm/fiche.php                   |    2 +-
 htdocs/comm/propal.php                  | 1697 +++++++++++++----------
 htdocs/comm/prospect/fiche.php          |    2 +-
 htdocs/core/menus/standard/eldy.lib.php |    2 +-
 htdocs/projet/element.php               |    2 +-
 5 files changed, 996 insertions(+), 709 deletions(-)

diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index 832885b0f8c..84987129be3 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -742,7 +742,7 @@ if ($id > 0)
 	if (! empty($conf->propal->enabled) && $user->rights->propal->creer)
 	{
 		$langs->load("propal");
-		print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/addpropal.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddProp").'</a>';
+		print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddProp").'</a>';
 	}
 
 	if (! empty($conf->commande->enabled) && $user->rights->commande->creer)
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 31c9e36d898..cd2f44878ed 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@capnetworks.com>
  * Copyright (C) 2006      Andre Cianfarani      <acianfa@free.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>
 *
@@ -38,7 +38,11 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (! empty($conf->projet->enabled))   require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+if (! empty($conf->projet->enabled)) 
+{
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+}
 
 $langs->load('companies');
 $langs->load('propal');
@@ -46,6 +50,7 @@ $langs->load('compta');
 $langs->load('bills');
 $langs->load('orders');
 $langs->load('products');
+$langs->load("deliveries");
 if (! empty($conf->margin->enabled))
   $langs->load('margins');
 
@@ -55,6 +60,8 @@ $id=GETPOST('id','int');
 $ref=GETPOST('ref','alpha');
 $socid=GETPOST('socid','int');
 $action=GETPOST('action','alpha');
+$origin=GETPOST('origin','alpha');
+$originid=GETPOST('originid','int');
 $confirm=GETPOST('confirm','alpha');
 $lineid=GETPOST('lineid','int');
 
@@ -72,30 +79,12 @@ $result = restrictedArea($user, 'propal', $id);
 
 $object = new Propal($db);
 
+// Load object
 // Load object
 if ($id > 0 || ! empty($ref))
 {
-	if ($action != 'add')
-	{
-		$ret=$object->fetch($id, $ref);
-		if ($ret == 0)
-		{
-			$langs->load("errors");
-			setEventMessage($langs->trans('ErrorRecordNotFound'), 'errors');
-			$error++;
-		}
-		else if ($ret < 0)
-		{
-			setEventMessage($object->error, 'errors');
-			$error++;
-		}
-		else $object->fetch_thirdparty();
-	}
-}
-else
-{
-	header('Location: '.DOL_URL_ROOT.'/comm/propal/list.php');
-	exit;
+	$ret=$object->fetch($id, $ref);
+	$ret=$object->fetch_thirdparty();
 }
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
@@ -262,14 +251,21 @@ else if ($action == 'add' && $user->rights->propal->creer)
 	if (empty($datep))
 	{
 		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Date")), 'errors');
-	    header("Location: ".DOL_URL_ROOT.'/comm/addpropal.php?socid='.$socid.'&action=create');
-	    exit;
+	    $action='create';
+		$error++;
 	}
 	if (empty($duration))
 	{
 		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("ValidityDuration")), 'errors');
-		header("Location: ".DOL_URL_ROOT.'/comm/addpropal.php?socid='.$socid.'&action=create');
-		exit;
+		$action='create';
+		$error++;
+	}
+	
+	if ($socid<1)
+	{
+		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Customer")),'errors');
+		$action='create';
+		$error++;
 	}
 
 	if (! $error)
@@ -1174,731 +1170,1022 @@ $companystatic=new Societe($db);
 
 $now=dol_now();
 
-/*
- * Show object in view mode
- */
-
-$soc = new Societe($db);
-$soc->fetch($object->socid);
-
-$head = propal_prepare_head($object);
-dol_fiche_head($head, 'comm', $langs->trans('Proposal'), 0, 'propal');
-
-$formconfirm='';
-
-// Clone confirmation
-if ($action == 'clone')
+// Add new proposal
+if ($action == 'create')
 {
-	// Create an array for form
-	$formquestion=array(
-	//'text' => $langs->trans("ConfirmClone"),
-	//array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneMainAttributes"),   'value' => 1),
-	//array('type' => 'checkbox', 'name' => 'update_prices',   'label' => $langs->trans("PuttingPricesUpToDate"),   'value' => 1),
-	array('type' => 'other', 'name' => 'socid',   'label' => $langs->trans("SelectThirdParty"),   'value' => $form->select_company(GETPOST('socid','int'),'socid','(s.client=1 OR s.client=2 OR s.client=3)'))
-	);
-	// Paiement incomplet. On demande si motif = escompte ou autre
-	$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('ClonePropal'),$langs->trans('ConfirmClonePropal',$object->ref),'confirm_clone',$formquestion,'yes',1);
-}
+	print_fiche_titre($langs->trans("NewProp"));
+	
+	$soc = new Societe($db);
+	if ($socid>0) $res=$soc->fetch($socid);
 
-// Confirm delete
-else if ($action == 'delete')
-{
-	$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteProp'), $langs->trans('ConfirmDeleteProp',$object->ref), 'confirm_delete','',0,1);
-}
+	$object = new Propal($db);
 
-// Confirm reopen
-else if ($action == 'reopen')
-{
-	$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReOpen'), $langs->trans('ConfirmReOpenProp',$object->ref), 'confirm_reopen','',0,1);
-}
-
-// Confirmation delete product/service line
-else if ($action == 'ask_deleteline')
-{
-	$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline','',0,1);
-}
-
-// Confirm validate proposal
-else if ($action == 'validate')
-{
-    $error=0;
-
-	// on verifie si l'objet est en numerotation provisoire
-	$ref = substr($object->ref, 1, 4);
-	if ($ref == 'PROV')
+	$numpr='';
+	$obj = $conf->global->PROPALE_ADDON;
+	if ($obj)
 	{
-		$numref = $object->getNextNumRef($soc);
-		if (empty($numref))
+		if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"))
 		{
-		    $error++;
-		    dol_htmloutput_errors($object->error);
+			require_once DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.'.php';
+			$modPropale = new $obj;
+			$numpr = $modPropale->getNextValue($soc,$object);
 		}
 	}
-	else
+
+	// 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)
 	{
-		$numref = $object->ref;
-	}
-
-	$text=$langs->trans('ConfirmValidateProp',$numref);
-	if (! empty($conf->notification->enabled))
-	{
-		require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
-		$notify=new Notify($db);
-		$text.='<br>';
-		$text.=$notify->confirmMessage('NOTIFY_VAL_PROPAL',$object->socid);
-	}
-
-	if (! $error) $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateProp'), $text, 'confirm_validate','',0,1);
-}
-
-if (! $formconfirm)
-{
-    $parameters=array('lineid'=>$lineid);
-    $formconfirm=$hookmanager->executeHooks('formConfirm',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-}
-
-// Print form confirm
-print $formconfirm;
-
-
-print '<table class="border" width="100%">';
-
-$linkback = '<a href="'.DOL_URL_ROOT.'/comm/propal/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-
-// Ref
-print '<tr><td>'.$langs->trans('Ref').'</td><td colspan="5">';
-print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
-print '</td></tr>';
-
-// Ref client
-print '<tr><td>';
-print '<table class="nobordernopadding" width="100%"><tr><td nowrap="nowrap">';
-print $langs->trans('RefCustomer').'</td><td align="left">';
-print '</td>';
-if ($action != 'refclient' && ! empty($object->brouillon)) print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=refclient&amp;id='.$object->id.'">'.img_edit($langs->trans('Modify')).'</a></td>';
-print '</tr></table>';
-print '</td><td colspan="5">';
-if ($user->rights->propal->creer && $action == 'refclient')
-{
-	print '<form action="propal.php?id='.$object->id.'" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="set_ref_client">';
-	print '<input type="text" class="flat" size="20" name="ref_client" value="'.$object->ref_client.'">';
-	print ' <input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-	print '</form>';
-}
-else
-{
-	print $object->ref_client;
-}
-print '</td>';
-print '</tr>';
-
-// Company
-print '<tr><td>'.$langs->trans('Company').'</td><td colspan="5">'.$soc->getNomUrl(1).'</td>';
-print '</tr>';
-
-// Ligne info remises tiers
-print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="5">';
-if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client);
-else print $langs->trans("CompanyHasNoRelativeDiscount");
-print '. ';
-$absolute_discount=$soc->getAvailableDiscounts('','fk_facture_source IS NULL');
-$absolute_creditnote=$soc->getAvailableDiscounts('','fk_facture_source IS NOT NULL');
-$absolute_discount=price2num($absolute_discount,'MT');
-$absolute_creditnote=price2num($absolute_creditnote,'MT');
-if ($absolute_discount)
-{
-	if ($object->statut > 0)
-	{
-		print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency));
-	}
-	else
-	{
-		// Remise dispo de type non avoir
-		$filter='fk_facture_source IS NULL';
-		print '<br>';
-		$form->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$object->id,0,'remise_id',$soc->id,$absolute_discount,$filter);
-	}
-}
-if ($absolute_creditnote)
-{
-	print $langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency)).'. ';
-}
-if (! $absolute_discount && ! $absolute_creditnote) print $langs->trans("CompanyHasNoAbsoluteDiscount").'.';
-print '</td></tr>';
-
-// Date of proposal
-print '<tr>';
-print '<td>';
-print '<table class="nobordernopadding" width="100%"><tr><td>';
-print $langs->trans('Date');
-print '</td>';
-if ($action != 'editdate' && ! empty($object->brouillon)) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'),1).'</a></td>';
-print '</tr></table>';
-print '</td><td colspan="3">';
-if (! empty($object->brouillon) && $action == 'editdate')
-{
-	print '<form name="editdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="setdate">';
-	$form->select_date($object->date,'re','','',0,"editdate");
-	print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-	print '</form>';
-}
-else
-{
-	if ($object->date)
-	{
-		print dol_print_date($object->date,'daytext');
-	}
-	else
-	{
-		print '&nbsp;';
-	}
-}
-print '</td>';
-
-// Date end proposal
-print '<tr>';
-print '<td>';
-print '<table class="nobordernopadding" width="100%"><tr><td>';
-print $langs->trans('DateEndPropal');
-print '</td>';
-if ($action != 'editecheance' && ! empty($object->brouillon)) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editecheance&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
-print '</tr></table>';
-print '</td><td colspan="3">';
-if (! empty($object->brouillon) && $action == 'editecheance')
-{
-	print '<form name="editecheance" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="setecheance">';
-	$form->select_date($object->fin_validite,'ech','','','',"editecheance");
-	print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-	print '</form>';
-}
-else
-{
-	if (! empty($object->fin_validite))
-	{
-		print dol_print_date($object->fin_validite,'daytext');
-		if ($object->statut == 1 && $object->fin_validite < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
-	}
-	else
-	{
-		print '&nbsp;';
-	}
-}
-print '</td>';
-print '</tr>';
-
-// Payment term
-print '<tr><td>';
-print '<table class="nobordernopadding" width="100%"><tr><td>';
-print $langs->trans('PaymentConditionsShort');
-print '</td>';
-if ($action != 'editconditions' && ! empty($object->brouillon)) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetConditions'),1).'</a></td>';
-print '</tr></table>';
-print '</td><td colspan="3">';
-if ($action == 'editconditions')
-{
-    $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
-}
-else
-{
-    $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
-}
-print '</td>';
-print '</tr>';
-
-// Delivery date
-$langs->load('deliveries');
-print '<tr><td>';
-print '<table class="nobordernopadding" width="100%"><tr><td>';
-print $langs->trans('DeliveryDate');
-print '</td>';
-if ($action != 'editdate_livraison' && ! empty($object->brouillon)) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetDeliveryDate'),1).'</a></td>';
-print '</tr></table>';
-print '</td><td colspan="3">';
-if ($action == 'editdate_livraison')
-{
-	print '<form name="editdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="setdate_livraison">';
-	$form->select_date($object->date_livraison,'liv_','','','',"editdate_livraison");
-	print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-	print '</form>';
-}
-else
-{
-	print dol_print_date($object->date_livraison,'daytext');
-}
-print '</td>';
-print '</tr>';
-
-// Delivery delay
-print '<tr><td>';
-print '<table class="nobordernopadding" width="100%"><tr><td>';
-print $langs->trans('AvailabilityPeriod');
-if (! empty($conf->commande->enabled)) print ' ('.$langs->trans('AfterOrder').')';
-print '</td>';
-if ($action != 'editavailability' && ! empty($object->brouillon)) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editavailability&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetAvailability'),1).'</a></td>';
-print '</tr></table>';
-print '</td><td colspan="3">';
-if ($action == 'editavailability')
-{
-	$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'availability_id',1);
-}
-else
-{
-	$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'none',1);
-}
-
-print '</td>';
-print '</tr>';
-
-// Origin of demand
-print '<tr><td>';
-print '<table class="nobordernopadding" width="100%"><tr><td>';
-print $langs->trans('Source');
-print '</td>';
-if ($action != 'editdemandreason' && ! empty($object->brouillon)) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdemandreason&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetDemandReason'),1).'</a></td>';
-print '</tr></table>';
-print '</td><td colspan="3">';
-//print $object->demand_reason_id;
-if ($action == 'editdemandreason')
-{
-	$form->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'demand_reason_id',1);
-}
-else
-{
-	$form->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'none');
-}
-
-print '</td>';
-print '</tr>';
-
-// Payment mode
-print '<tr>';
-print '<td width="25%">';
-print '<table class="nobordernopadding" width="100%"><tr><td>';
-print $langs->trans('PaymentMode');
-print '</td>';
-if ($action != 'editmode' && ! empty($object->brouillon)) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMode'),1).'</a></td>';
-print '</tr></table>';
-print '</td><td colspan="3">';
-if ($action == 'editmode')
-{
-	$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
-}
-else
-{
-	$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
-}
-print '</td></tr>';
-
-// Project
-if (! empty($conf->projet->enabled))
-{
-	$langs->load("projects");
-	print '<tr><td>';
-	print '<table class="nobordernopadding" width="100%"><tr><td>';
-	print $langs->trans('Project').'</td>';
-	if ($user->rights->propal->creer)
-	{
-		if ($action != 'classify') print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a></td>';
-		print '</tr></table>';
-		print '</td><td colspan="3">';
-		if ($action == 'classify')
+		$obj=$db->fetch_object($resql);
+		$num = $obj->nb;
+		$db->free($resql);
+		if ($num > 0)
 		{
-			$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid');
+			$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">';
+	
+	if ($origin != 'project' && $originid)
+	{
+		print '<input type="hidden" name="origin" value="'.$origin.'">';
+		print '<input type="hidden" name="originid" value="'.$originid.'">';
+	}
+
+	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>';
+
+	// Ref customer
+	print '<tr><td>'.$langs->trans('RefCustomer').'</td><td colspan="2">';
+	print '<input type="text" name="ref_client" value=""></td>';
+	print '</tr>';
+
+	// Third party
+	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";
+
+	// Contacts
+	if($socid>0)
+	{
+		print "<tr><td>".$langs->trans("DefaultContact").'</td><td colspan="2">';
+		$form->select_contacts($soc->id,$setcontact,'contactidp',1,$srccontactslist);
+		print '</td></tr>';
+
+		// 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");
+		$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>';
+	}
+
+	// Date
+	print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td colspan="2">';
+	$form->select_date('','','','','',"addprop");
+	print '</td></tr>';
+
+	// Validaty duration
+	print '<tr><td class="fieldrequired">'.$langs->trans("ValidityDuration").'</td><td colspan="2"><input name="duree_validite" size="5" value="'.$conf->global->PROPALE_VALIDITY_DURATION.'"> '.$langs->trans("days").'</td></tr>';
+
+	// Terms of payment
+	print '<tr><td nowrap="nowrap" class="fieldrequired">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';
+	$form->select_conditions_paiements($soc->cond_reglement,'cond_reglement_id');
+	print '</td></tr>';
+
+	// Mode of payment
+	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';
+	$form->select_types_paiements($soc->mode_reglement,'mode_reglement_id');
+	print '</td></tr>';
+
+	// What trigger creation
+	print '<tr><td>'.$langs->trans('Source').'</td><td>';
+	$form->select_demand_reason('','demand_reason_id',"SRC_PROP",1);
+	print '</td></tr>';
+
+	// Delivery delay
+	print '<tr><td>'.$langs->trans('AvailabilityPeriod').'</td><td colspan="2">';
+	$form->select_availability('','availability_id','',1);
+	print '</td></tr>';
+
+	// Delivery date (or manufacturing)
+	print '<tr><td>'.$langs->trans("DeliveryDate").'</td>';
+	print '<td colspan="2">';
+	if ($conf->global->DATE_LIVRAISON_WEEK_DELAY != "")
+	{
+		$tmpdte = time() + ((7 * $conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
+		$syear = date("Y", $tmpdte);
+		$smonth = date("m", $tmpdte);
+		$sday = date("d", $tmpdte);
+		$form->select_date($syear."-".$smonth."-".$sday,'liv_','','','',"addprop");
+	}
+	else
+	{
+		$datepropal=empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0;
+		$form->select_date($datepropal,'liv_','','','',"addprop");
+	}
+	print '</td></tr>';
+
+	// Model
+	print '<tr>';
+	print '<td>'.$langs->trans("DefaultModel").'</td>';
+	print '<td colspan="2">';
+	$liste=ModelePDFPropales::liste_modeles($db);
+	print $form->selectarray('model',$liste,$conf->global->PROPALE_ADDON_PDF);
+	print "</td></tr>";
+
+	// Project
+	if (! empty($conf->projet->enabled) && $socid>0)
+	{
+		$projectid = 0;
+		if ($origin == 'project') $projectid = ($originid?$originid:0);
+
+		print '<tr>';
+		print '<td valign="top">'.$langs->trans("Project").'</td><td colspan="2">';
+
+		$numprojet=select_projects($soc->id,$projectid);
+		if ($numprojet==0)
+		{
+			print ' &nbsp; <a href="../projet/fiche.php?socid='.$soc->id.'&action=create">'.$langs->trans("AddProject").'</a>';
+		}
+		print '</td>';
+		print '</tr>';
+	}
+
+	// Other attributes
+	$parameters=array('colspan' => ' colspan="3"');
+	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	{
+		foreach($extrafields->attribute_label as $key=>$label)
+		{
+			$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]);
+			print '<tr><td';
+			if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
+			print '>'.$label.'</td><td colspan="3">';
+			print $extrafields->showInputField($key,$value);
+			print '</td></tr>'."\n";
+		}
+	}
+
+	print "</table>";
+	print '<br>';
+
+	/*
+	 * Combobox pour la fonction de copie
+	*/
+
+	if (empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE))
+	{
+		print '<input type="hidden" name="createmode" value="empty">';
+	}
+
+	print '<table>';
+	if (! empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE))
+	{
+		// For backward compatibility
+		print '<tr>';
+		print '<td><input type="radio" name="createmode" value="copy"></td>';
+		print '<td>'.$langs->trans("CopyPropalFrom").' </td>';
+		print '<td>';
+		$liste_propal = array();
+		$liste_propal[0] = '';
+
+		$sql ="SELECT p.rowid as id, p.ref, s.nom";
+		$sql.=" FROM ".MAIN_DB_PREFIX."propal p";
+		$sql.= ", ".MAIN_DB_PREFIX."societe s";
+		$sql.= " WHERE s.rowid = p.fk_soc";
+		$sql.= " AND p.entity = ".$conf->entity;
+		$sql.= " AND p.fk_statut <> 0";
+		$sql.= " ORDER BY Id";
+
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$num = $db->num_rows($resql);
+			$i = 0;
+			while ($i < $num)
+			{
+				$row = $db->fetch_row($resql);
+				$propalRefAndSocName = $row[1]." - ".$row[2];
+				$liste_propal[$row[0]]=$propalRefAndSocName;
+				$i++;
+			}
+			print $form->selectarray("copie_propal",$liste_propal, 0);
 		}
 		else
 		{
-			$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
+			dol_print_error($db);
+		}
+		print '</td></tr>';
+
+		if (! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE)) print '<tr><td colspan="3">&nbsp;</td></tr>';
+
+		print '<tr><td valign="top"><input type="radio" name="createmode" value="empty" checked="checked"></td>';
+		print '<td valign="top" colspan="2">'.$langs->trans("CreateEmptyPropal").'</td></tr>';
+	}
+
+	if (! empty($conf->global->PRODUCT_SHOW_WHEN_CREATE))
+	{
+		print '<tr><td colspan="3">';
+		if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
+		{
+			$lib=$langs->trans("ProductsAndServices");
+
+			print '<table class="border" width="100%">';
+			print '<tr>';
+			print '<td>'.$lib.'</td>';
+			print '<td>'.$langs->trans("Qty").'</td>';
+			print '<td>'.$langs->trans("ReductionShort").'</td>';
+			print '</tr>';
+			for ($i = 1 ; $i <= $conf->global->PRODUCT_SHOW_WHEN_CREATE; $i++)
+			{
+				print '<tr><td>';
+				// multiprix
+				if($conf->global->PRODUIT_MULTIPRICES && $soc->price_level)
+					$form->select_produits('',"idprod".$i,'',$conf->product->limit_size,$soc->price_level);
+				else
+					$form->select_produits('',"idprod".$i,'',$conf->product->limit_size);
+				print '</td>';
+				print '<td><input type="text" size="2" name="qty'.$i.'" value="1"></td>';
+				print '<td><input type="text" size="2" name="remise'.$i.'" value="'.$soc->remise_client.'">%</td>';
+				print '</tr>';
+			}
+
+			print "</table>";
+
 		}
 		print '</td></tr>';
 	}
-	else
+	print '</table>';
+	print '<br>';
+
+	$langs->load("bills");
+	print '<center>';
+	print '<input type="submit" class="button" value="'.$langs->trans("CreateDraft").'">';
+	print '&nbsp;<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+	print '</center>';
+
+	print "</form>";
+}
+else 
+{
+	/*
+	 * Show object in view mode
+	 */
+	
+	$soc = new Societe($db);
+	$soc->fetch($object->socid);
+	
+	$head = propal_prepare_head($object);
+	dol_fiche_head($head, 'comm', $langs->trans('Proposal'), 0, 'propal');
+	
+	$formconfirm='';
+	
+	// Clone confirmation
+	if ($action == 'clone')
 	{
-		print '</td></tr></table>';
-		if (! empty($object->fk_project))
-		{
-			print '<td colspan="3">';
-			$proj = new Project($db);
-			$proj->fetch($object->fk_project);
-			print '<a href="../projet/fiche.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-			print $proj->ref;
-			print '</a>';
-			print '</td>';
-		}
-		else {
-			print '<td colspan="3">&nbsp;</td>';
-		}
+		// Create an array for form
+		$formquestion=array(
+		//'text' => $langs->trans("ConfirmClone"),
+		//array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneMainAttributes"),   'value' => 1),
+		//array('type' => 'checkbox', 'name' => 'update_prices',   'label' => $langs->trans("PuttingPricesUpToDate"),   'value' => 1),
+		array('type' => 'other', 'name' => 'socid',   'label' => $langs->trans("SelectThirdParty"),   'value' => $form->select_company(GETPOST('socid','int'),'socid','(s.client=1 OR s.client=2 OR s.client=3)'))
+		);
+		// Paiement incomplet. On demande si motif = escompte ou autre
+		$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('ClonePropal'),$langs->trans('ConfirmClonePropal',$object->ref),'confirm_clone',$formquestion,'yes',1);
 	}
-	print '</tr>';
-}
-
-// Other attributes
-$parameters=array('colspan' => ' colspan="3"');
-$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
-if (empty($reshook) && ! empty($extrafields->attribute_label))
-{
-    foreach($extrafields->attribute_label as $key=>$label)
-    {
-        $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]);
-   		print '<tr><td';
-   		if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
-   		print '>'.$label.'</td><td colspan="3">';
-        print $extrafields->showInputField($key,$value);
-        print '</td></tr>'."\n";
-    }
-}
-
-// Amount HT
-print '<tr><td height="10">'.$langs->trans('AmountHT').'</td>';
-print '<td align="right" nowrap><b>'.price($object->total_ht).'</b></td>';
-print '<td>'.$langs->trans("Currency".$conf->currency).'</td>';
-
-// Margin Infos
-if (! empty($conf->margin->enabled)) {
-  print '<td valign="top" width="50%" rowspan="4">';
-  $object->displayMarginInfos();
-  print '</td>';
-}
-print '</tr>';
-
-// Amount VAT
-print '<tr><td height="10">'.$langs->trans('AmountVAT').'</td>';
-print '<td align="right" nowrap>'.price($object->total_tva).'</td>';
-print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-
-// Amount Local Taxes
-if ($mysoc->localtax1_assuj=="1") //Localtax1
-{
-	print '<tr><td height="10">'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td>';
-	print '<td align="right" nowrap>'.price($object->total_localtax1).'</td>';
-	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-}
-if ($mysoc->localtax2_assuj=="1") //Localtax2
-{
-	print '<tr><td height="10">'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td>';
-	print '<td align="right" nowrap>'.price($object->total_localtax2).'</td>';
-	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-}
-
-
-// Amount TTC
-print '<tr><td height="10">'.$langs->trans('AmountTTC').'</td>';
-print '<td align="right" nowrap>'.price($object->total_ttc).'</td>';
-print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-
-// Statut
-print '<tr><td height="10">'.$langs->trans('Status').'</td><td align="left" colspan="2">'.$object->getLibStatut(4).'</td></tr>';
-
-print '</table><br>';
-
-if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-{
-	$blocname = 'contacts';
-	$title = $langs->trans('ContactsAddresses');
-	include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
-}
-
-if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-{
-	$blocname = 'notes';
-	$title = $langs->trans('Notes');
-	include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
-}
-
-/*
- * Lines
- */
-
-if (! empty($conf->use_javascript_ajax) && $object->statut == 0)
-{
-	include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
-}
-
-print '<table id="tablelines" class="noborder" width="100%">';
-
-// Show object lines
-$result = $object->getLinesArray();
-if (! empty($object->lines))
-	$ret=$object->printObjectLines($action,$mysoc,$soc,$lineid);
-
-// Form to add new line
-if ($object->statut == 0 && $user->rights->propal->creer)
-{
-	if ($action != 'editline')
+	
+	// Confirm delete
+	else if ($action == 'delete')
 	{
-		$var=true;
-
-		if ($conf->global->MAIN_FEATURES_LEVEL > 1)
+		$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteProp'), $langs->trans('ConfirmDeleteProp',$object->ref), 'confirm_delete','',0,1);
+	}
+	
+	// Confirm reopen
+	else if ($action == 'reopen')
+	{
+		$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReOpen'), $langs->trans('ConfirmReOpenProp',$object->ref), 'confirm_reopen','',0,1);
+	}
+	
+	// Confirmation delete product/service line
+	else if ($action == 'ask_deleteline')
+	{
+		$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline','',0,1);
+	}
+	
+	// Confirm validate proposal
+	else if ($action == 'validate')
+	{
+	    $error=0;
+	
+		// on verifie si l'objet est en numerotation provisoire
+		$ref = substr($object->ref, 1, 4);
+		if ($ref == 'PROV')
 		{
-			// Add free or predefined products/services
-			$object->formAddObjectLine(0,$mysoc,$soc);
+			$numref = $object->getNextNumRef($soc);
+			if (empty($numref))
+			{
+			    $error++;
+			    dol_htmloutput_errors($object->error);
+			}
 		}
 		else
 		{
-			// Add free products/services
-			$object->formAddFreeProduct(0,$mysoc,$soc);
-
-			// Add predefined products/services
-			if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
-			{
-				$var=!$var;
-				$object->formAddPredefinedProduct(0,$mysoc,$soc);
-			}
+			$numref = $object->ref;
 		}
-
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formAddObjectLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	
+		$text=$langs->trans('ConfirmValidateProp',$numref);
+		if (! empty($conf->notification->enabled))
+		{
+			require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
+			$notify=new Notify($db);
+			$text.='<br>';
+			$text.=$notify->confirmMessage('NOTIFY_VAL_PROPAL',$object->socid);
+		}
+	
+		if (! $error) $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateProp'), $text, 'confirm_validate','',0,1);
 	}
-}
-
-print '</table>';
-
-print '</div>';
-print "\n";
-
-if ($action == 'statut')
-{
-	/*
-	 * Formulaire cloture (signe ou non)
-	 */
-	$form_close = '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-	$form_close.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	$form_close.= '<table class="border" width="100%">';
-    $form_close.= '<tr><td width="150"  align="left">'.$langs->trans("CloseAs").'</td><td align="left">';
-    $form_close.= '<input type="hidden" name="action" value="setstatut">';
-    $form_close.= '<select id="statut" name="statut" class="flat">';
-    $form_close.= '<option value="0">&nbsp;</option>';
-    $form_close.= '<option value="2">'.$object->labelstatut[2].'</option>';
-    $form_close.= '<option value="3">'.$object->labelstatut[3].'</option>';
-    $form_close.= '</select>';
-    $form_close.= '</td></tr>';
-	$form_close.= '<tr><td width="150" align="left">'.$langs->trans('Note').'</td><td align="left"><textarea cols="70" rows="'.ROWS_3.'" wrap="soft" name="note">';
-	$form_close.= $object->note;
-	$form_close.= '</textarea></td></tr>';
-	$form_close.= '<tr><td align="center" colspan="2">';
-	$form_close.= '<input type="submit" class="button" name="validate" value="'.$langs->trans('Validate').'">';
-	$form_close.= ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
-	$form_close.= '<a name="close">&nbsp;</a>';
-	$form_close.= '</td>';
-	$form_close.= '</tr></table></form>';
-
-	print $form_close;
-}
-
-
-/*
- * Boutons Actions
- */
-if ($action != 'presend')
-{
-	print '<div class="tabsAction">';
-
-	if ($action != 'statut' && $action <> 'editline')
+	
+	if (! $formconfirm)
 	{
-		// Validate
-		if ($object->statut == 0 && $user->rights->propal->valider)
+	    $parameters=array('lineid'=>$lineid);
+	    $formconfirm=$hookmanager->executeHooks('formConfirm',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	}
+	
+	// Print form confirm
+	print $formconfirm;
+	
+	
+	print '<table class="border" width="100%">';
+	
+	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/propal/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+	
+	// Ref
+	print '<tr><td>'.$langs->trans('Ref').'</td><td colspan="5">';
+	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
+	print '</td></tr>';
+	
+	// Ref client
+	print '<tr><td>';
+	print '<table class="nobordernopadding" width="100%"><tr><td nowrap="nowrap">';
+	print $langs->trans('RefCustomer').'</td><td align="left">';
+	print '</td>';
+	if ($action != 'refclient' && ! empty($object->brouillon)) print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=refclient&amp;id='.$object->id.'">'.img_edit($langs->trans('Modify')).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="5">';
+	if ($user->rights->propal->creer && $action == 'refclient')
+	{
+		print '<form action="propal.php?id='.$object->id.'" method="post">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="set_ref_client">';
+		print '<input type="text" class="flat" size="20" name="ref_client" value="'.$object->ref_client.'">';
+		print ' <input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+		print '</form>';
+	}
+	else
+	{
+		print $object->ref_client;
+	}
+	print '</td>';
+	print '</tr>';
+	
+	// Company
+	print '<tr><td>'.$langs->trans('Company').'</td><td colspan="5">'.$soc->getNomUrl(1).'</td>';
+	print '</tr>';
+	
+	// Ligne info remises tiers
+	print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="5">';
+	if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client);
+	else print $langs->trans("CompanyHasNoRelativeDiscount");
+	print '. ';
+	$absolute_discount=$soc->getAvailableDiscounts('','fk_facture_source IS NULL');
+	$absolute_creditnote=$soc->getAvailableDiscounts('','fk_facture_source IS NOT NULL');
+	$absolute_discount=price2num($absolute_discount,'MT');
+	$absolute_creditnote=price2num($absolute_creditnote,'MT');
+	if ($absolute_discount)
+	{
+		if ($object->statut > 0)
 		{
-		    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>';
+			print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency));
 		}
-
-		// Edit
-		if ($object->statut == 1 && $user->rights->propal->creer)
+		else
 		{
-			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=modif">'.$langs->trans('Modify').'</a>';
+			// Remise dispo de type non avoir
+			$filter='fk_facture_source IS NULL';
+			print '<br>';
+			$form->form_remise_dispo($_SERVER["PHP_SELF"].'?id='.$object->id,0,'remise_id',$soc->id,$absolute_discount,$filter);
 		}
-
-		// ReOpen
-		if (($object->statut == 2 || $object->statut == 3) && $user->rights->propal->cloturer)
+	}
+	if ($absolute_creditnote)
+	{
+		print $langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency)).'. ';
+	}
+	if (! $absolute_discount && ! $absolute_creditnote) print $langs->trans("CompanyHasNoAbsoluteDiscount").'.';
+	print '</td></tr>';
+	
+	// Date of proposal
+	print '<tr>';
+	print '<td>';
+	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print $langs->trans('Date');
+	print '</td>';
+	if ($action != 'editdate' && ! empty($object->brouillon)) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	if (! empty($object->brouillon) && $action == 'editdate')
+	{
+		print '<form name="editdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="setdate">';
+		$form->select_date($object->date,'re','','',0,"editdate");
+		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+		print '</form>';
+	}
+	else
+	{
+		if ($object->date)
 		{
-			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen'.(empty($conf->global->MAIN_JUMP_TAG)?'':'#reopen').'"';
-			print '>'.$langs->trans('ReOpen').'</a>';
+			print dol_print_date($object->date,'daytext');
 		}
-
-		// Send
-		if ($object->statut == 1 || $object->statut == 2)
+		else
 		{
-            if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->propal->propal_advance->send)
-            {
-			   print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a>';
-            }
-            else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
+			print '&nbsp;';
 		}
-
-        // Create an order
-        if (! empty($conf->commande->enabled) && $object->statut == 2 && $user->societe_id == 0)
-        {
-            if ($user->rights->commande->creer)
-            {
-                print '<a class="butAction" href="'.DOL_URL_ROOT.'/commande/fiche.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddOrder").'</a>';
-            }
-        }
-
-        // Create an invoice and classify billed
-		if ($object->statut == 2 && $user->societe_id == 0)
+	}
+	print '</td>';
+	
+	// Date end proposal
+	print '<tr>';
+	print '<td>';
+	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print $langs->trans('DateEndPropal');
+	print '</td>';
+	if ($action != 'editecheance' && ! empty($object->brouillon)) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editecheance&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	if (! empty($object->brouillon) && $action == 'editecheance')
+	{
+		print '<form name="editecheance" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="setecheance">';
+		$form->select_date($object->fin_validite,'ech','','','',"editecheance");
+		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+		print '</form>';
+	}
+	else
+	{
+		if (! empty($object->fin_validite))
 		{
-			if (! empty($conf->facture->enabled) && $user->rights->facture->creer)
-			{
-				print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddBill").'</a>';
-			}
-
-			$arraypropal=$object->getInvoiceArrayList();
-			if (is_array($arraypropal) && count($arraypropal) > 0)
-			{
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled&amp;socid='.$object->socid.'">'.$langs->trans("ClassifyBilled").'</a>';
-			}
+			print dol_print_date($object->fin_validite,'daytext');
+			if ($object->statut == 1 && $object->fin_validite < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late"));
 		}
-
-		// Close
-		if ($object->statut == 1 && $user->rights->propal->cloturer)
+		else
 		{
-			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=statut'.(empty($conf->global->MAIN_JUMP_TAG)?'':'#close').'"';
-			print '>'.$langs->trans('Close').'</a>';
+			print '&nbsp;';
 		}
-
-		// Clone
+	}
+	print '</td>';
+	print '</tr>';
+	
+	// Payment term
+	print '<tr><td>';
+	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print $langs->trans('PaymentConditionsShort');
+	print '</td>';
+	if ($action != 'editconditions' && ! empty($object->brouillon)) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetConditions'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	if ($action == 'editconditions')
+	{
+	    $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
+	}
+	else
+	{
+	    $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
+	}
+	print '</td>';
+	print '</tr>';
+	
+	// Delivery date
+	$langs->load('deliveries');
+	print '<tr><td>';
+	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print $langs->trans('DeliveryDate');
+	print '</td>';
+	if ($action != 'editdate_livraison' && ! empty($object->brouillon)) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetDeliveryDate'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	if ($action == 'editdate_livraison')
+	{
+		print '<form name="editdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		print '<input type="hidden" name="action" value="setdate_livraison">';
+		$form->select_date($object->date_livraison,'liv_','','','',"editdate_livraison");
+		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+		print '</form>';
+	}
+	else
+	{
+		print dol_print_date($object->date_livraison,'daytext');
+	}
+	print '</td>';
+	print '</tr>';
+	
+	// Delivery delay
+	print '<tr><td>';
+	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print $langs->trans('AvailabilityPeriod');
+	if (! empty($conf->commande->enabled)) print ' ('.$langs->trans('AfterOrder').')';
+	print '</td>';
+	if ($action != 'editavailability' && ! empty($object->brouillon)) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editavailability&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetAvailability'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	if ($action == 'editavailability')
+	{
+		$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'availability_id',1);
+	}
+	else
+	{
+		$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'none',1);
+	}
+	
+	print '</td>';
+	print '</tr>';
+	
+	// Origin of demand
+	print '<tr><td>';
+	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print $langs->trans('Source');
+	print '</td>';
+	if ($action != 'editdemandreason' && ! empty($object->brouillon)) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdemandreason&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetDemandReason'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	//print $object->demand_reason_id;
+	if ($action == 'editdemandreason')
+	{
+		$form->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'demand_reason_id',1);
+	}
+	else
+	{
+		$form->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'none');
+	}
+	
+	print '</td>';
+	print '</tr>';
+	
+	// Payment mode
+	print '<tr>';
+	print '<td width="25%">';
+	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print $langs->trans('PaymentMode');
+	print '</td>';
+	if ($action != 'editmode' && ! empty($object->brouillon)) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMode'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	if ($action == 'editmode')
+	{
+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'mode_reglement_id');
+	}
+	else
+	{
+		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
+	}
+	print '</td></tr>';
+	
+	// Project
+	if (! empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		print '<tr><td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('Project').'</td>';
 		if ($user->rights->propal->creer)
 		{
-			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object='.$object->element.'">'.$langs->trans("ToClone").'</a>';
+			if ($action != 'classify') print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a></td>';
+			print '</tr></table>';
+			print '</td><td colspan="3">';
+			if ($action == 'classify')
+			{
+				$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid');
+			}
+			else
+			{
+				$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none');
+			}
+			print '</td></tr>';
 		}
-
-		// Delete
-		if ($user->rights->propal->supprimer)
+		else
 		{
-			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete"';
-			print '>'.$langs->trans('Delete').'</a>';
+			print '</td></tr></table>';
+			if (! empty($object->fk_project))
+			{
+				print '<td colspan="3">';
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				print '<a href="../projet/fiche.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				print $proj->ref;
+				print '</a>';
+				print '</td>';
+			}
+			else {
+				print '<td colspan="3">&nbsp;</td>';
+			}
 		}
-
+		print '</tr>';
 	}
-
-	print '</div>';
-	print "<br>\n";
-}
-
-if ($action != 'presend')
-{
-	print '<table width="100%"><tr><td width="50%" valign="top">';
-	print '<a name="builddoc"></a>'; // ancre
-
-
-	/*
-	 * Documents generes
-	 */
-	$filename=dol_sanitizeFileName($object->ref);
-	$filedir=$conf->propal->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
-	$genallowed=$user->rights->propal->creer;
-	$delallowed=$user->rights->propal->supprimer;
-
-	$var=true;
-
-	$somethingshown=$formfile->show_documents('propal',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'',0,'',$soc->default_lang);
-
-
-	/*
-	 * Linked object block
-	 */
-	$somethingshown=$object->showLinkedObjectBlock();
-
-	print '</td><td valign="top" width="50%">';
-
-	// List of actions on element
-	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-	$formactions=new FormActions($db);
-	$somethingshown=$formactions->showactions($object,'propal',$socid);
-
-	print '</td></tr></table>';
-}
-
-
-/*
- * Action presend
- *
- */
-if ($action == 'presend')
-{
-	$ref = dol_sanitizeFileName($object->ref);
-    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    $fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref, preg_quote($object->ref,'/'));
-    $file=$fileparams['fullname'];
-
-    // Build document if it not exists
-    if (! $file || ! is_readable($file))
-    {
-        // Define output language
-        $outputlangs = $langs;
-        $newlang='';
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-        if (! empty($newlang))
-        {
-            $outputlangs = new Translate("",$conf);
-            $outputlangs->setDefaultLang($newlang);
-        }
-
-        $result=propale_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-        if ($result <= 0)
-        {
-            dol_print_error($db,$result);
-            exit;
-        }
-        $fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref, preg_quote($object->ref,'/'));
-        $file=$fileparams['fullname'];
-    }
-
-	print '<br>';
-	print_titre($langs->trans('SendPropalByMail'));
-
-	// Create form object
-	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-	$formmail = new FormMail($db);
-	$formmail->fromtype = 'user';
-	$formmail->fromid   = $user->id;
-	$formmail->fromname = $user->getFullName($langs);
-	$formmail->frommail = $user->email;
-	$formmail->withfrom=1;
-	$formmail->withto=empty($_POST["sendto"])?1:$_POST["sendto"];
-	$formmail->withtosocid=$soc->id;
-	$formmail->withtocc=1;
-	$formmail->withtoccsocid=0;
-	$formmail->withtoccc=(! empty($conf->global->MAIN_EMAIL_USECCC)?$conf->global->MAIN_EMAIL_USECCC:false);
-	$formmail->withtocccsocid=0;
-	$formmail->withtopic=$langs->trans('SendPropalRef','__PROPREF__');
-	$formmail->withfile=2;
-	$formmail->withbody=1;
-	$formmail->withdeliveryreceipt=1;
-	$formmail->withcancel=1;
-
-	// Tableau des substitutions
-	$formmail->substit['__PROPREF__']=$object->ref;
-    $formmail->substit['__SIGNATURE__']=$user->signature;
-    $formmail->substit['__PERSONALIZED__']='';
-	// Tableau des parametres complementaires
-	$formmail->param['action']='send';
-	$formmail->param['models']='propal_send';
-	$formmail->param['id']=$object->id;
-	$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-	// Init list of files
-    if (GETPOST("mode")=='init')
+	
+	// Other attributes
+	$parameters=array('colspan' => ' colspan="3"');
+	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	if (empty($reshook) && ! empty($extrafields->attribute_label))
 	{
-		$formmail->clear_attached_files();
-        $formmail->add_attached_files($file,basename($file),dol_mimetype($file));
+	    foreach($extrafields->attribute_label as $key=>$label)
+	    {
+	        $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]);
+	   		print '<tr><td';
+	   		if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
+	   		print '>'.$label.'</td><td colspan="3">';
+	        print $extrafields->showInputField($key,$value);
+	        print '</td></tr>'."\n";
+	    }
+	}
+	
+	// Amount HT
+	print '<tr><td height="10">'.$langs->trans('AmountHT').'</td>';
+	print '<td align="right" nowrap><b>'.price($object->total_ht).'</b></td>';
+	print '<td>'.$langs->trans("Currency".$conf->currency).'</td>';
+	
+	// Margin Infos
+	if (! empty($conf->margin->enabled)) {
+	  print '<td valign="top" width="50%" rowspan="4">';
+	  $object->displayMarginInfos();
+	  print '</td>';
+	}
+	print '</tr>';
+	
+	// Amount VAT
+	print '<tr><td height="10">'.$langs->trans('AmountVAT').'</td>';
+	print '<td align="right" nowrap>'.price($object->total_tva).'</td>';
+	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+	
+	// Amount Local Taxes
+	if ($mysoc->localtax1_assuj=="1") //Localtax1
+	{
+		print '<tr><td height="10">'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td>';
+		print '<td align="right" nowrap>'.price($object->total_localtax1).'</td>';
+		print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+	}
+	if ($mysoc->localtax2_assuj=="1") //Localtax2
+	{
+		print '<tr><td height="10">'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td>';
+		print '<td align="right" nowrap>'.price($object->total_localtax2).'</td>';
+		print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+	}
+	
+	
+	// Amount TTC
+	print '<tr><td height="10">'.$langs->trans('AmountTTC').'</td>';
+	print '<td align="right" nowrap>'.price($object->total_ttc).'</td>';
+	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+	
+	// Statut
+	print '<tr><td height="10">'.$langs->trans('Status').'</td><td align="left" colspan="2">'.$object->getLibStatut(4).'</td></tr>';
+	
+	print '</table><br>';
+	
+	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+	{
+		$blocname = 'contacts';
+		$title = $langs->trans('ContactsAddresses');
+		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
+	}
+	
+	if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+		$blocname = 'notes';
+		$title = $langs->trans('Notes');
+		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
+	}
+	
+	/*
+	 * Lines
+	 */
+	
+	if (! empty($conf->use_javascript_ajax) && $object->statut == 0)
+	{
+		include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
+	}
+	
+	print '<table id="tablelines" class="noborder" width="100%">';
+	
+	// Show object lines
+	$result = $object->getLinesArray();
+	if (! empty($object->lines))
+		$ret=$object->printObjectLines($action,$mysoc,$soc,$lineid);
+	
+	// Form to add new line
+	if ($object->statut == 0 && $user->rights->propal->creer)
+	{
+		if ($action != 'editline')
+		{
+			$var=true;
+	
+			if ($conf->global->MAIN_FEATURES_LEVEL > 1)
+			{
+				// Add free or predefined products/services
+				$object->formAddObjectLine(0,$mysoc,$soc);
+			}
+			else
+			{
+				// Add free products/services
+				$object->formAddFreeProduct(0,$mysoc,$soc);
+	
+				// Add predefined products/services
+				if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
+				{
+					$var=!$var;
+					$object->formAddPredefinedProduct(0,$mysoc,$soc);
+				}
+			}
+	
+			$parameters=array();
+			$reshook=$hookmanager->executeHooks('formAddObjectLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+		}
+	}
+	
+	print '</table>';
+	
+	print '</div>';
+	print "\n";
+	
+	if ($action == 'statut')
+	{
+		/*
+		 * Formulaire cloture (signe ou non)
+		 */
+		$form_close = '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+		$form_close.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$form_close.= '<table class="border" width="100%">';
+	    $form_close.= '<tr><td width="150"  align="left">'.$langs->trans("CloseAs").'</td><td align="left">';
+	    $form_close.= '<input type="hidden" name="action" value="setstatut">';
+	    $form_close.= '<select id="statut" name="statut" class="flat">';
+	    $form_close.= '<option value="0">&nbsp;</option>';
+	    $form_close.= '<option value="2">'.$object->labelstatut[2].'</option>';
+	    $form_close.= '<option value="3">'.$object->labelstatut[3].'</option>';
+	    $form_close.= '</select>';
+	    $form_close.= '</td></tr>';
+		$form_close.= '<tr><td width="150" align="left">'.$langs->trans('Note').'</td><td align="left"><textarea cols="70" rows="'.ROWS_3.'" wrap="soft" name="note">';
+		$form_close.= $object->note;
+		$form_close.= '</textarea></td></tr>';
+		$form_close.= '<tr><td align="center" colspan="2">';
+		$form_close.= '<input type="submit" class="button" name="validate" value="'.$langs->trans('Validate').'">';
+		$form_close.= ' &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
+		$form_close.= '<a name="close">&nbsp;</a>';
+		$form_close.= '</td>';
+		$form_close.= '</tr></table></form>';
+	
+		print $form_close;
+	}
+	
+	
+	/*
+	 * Boutons Actions
+	 */
+	if ($action != 'presend')
+	{
+		print '<div class="tabsAction">';
+	
+		if ($action != 'statut' && $action <> 'editline')
+		{
+			// Validate
+			if ($object->statut == 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>';
+			}
+	
+			// Edit
+			if ($object->statut == 1 && $user->rights->propal->creer)
+			{
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=modif">'.$langs->trans('Modify').'</a>';
+			}
+	
+			// ReOpen
+			if (($object->statut == 2 || $object->statut == 3) && $user->rights->propal->cloturer)
+			{
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen'.(empty($conf->global->MAIN_JUMP_TAG)?'':'#reopen').'"';
+				print '>'.$langs->trans('ReOpen').'</a>';
+			}
+	
+			// Send
+			if ($object->statut == 1 || $object->statut == 2)
+			{
+	            if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->propal->propal_advance->send)
+	            {
+				   print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=presend&amp;mode=init">'.$langs->trans('SendByMail').'</a>';
+	            }
+	            else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
+			}
+	
+	        // Create an order
+	        if (! empty($conf->commande->enabled) && $object->statut == 2 && $user->societe_id == 0)
+	        {
+	            if ($user->rights->commande->creer)
+	            {
+	                print '<a class="butAction" href="'.DOL_URL_ROOT.'/commande/fiche.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddOrder").'</a>';
+	            }
+	        }
+	
+	        // Create an invoice and classify billed
+			if ($object->statut == 2 && $user->societe_id == 0)
+			{
+				if (! empty($conf->facture->enabled) && $user->rights->facture->creer)
+				{
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddBill").'</a>';
+				}
+	
+				$arraypropal=$object->getInvoiceArrayList();
+				if (is_array($arraypropal) && count($arraypropal) > 0)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled&amp;socid='.$object->socid.'">'.$langs->trans("ClassifyBilled").'</a>';
+				}
+			}
+	
+			// Close
+			if ($object->statut == 1 && $user->rights->propal->cloturer)
+			{
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=statut'.(empty($conf->global->MAIN_JUMP_TAG)?'':'#close').'"';
+				print '>'.$langs->trans('Close').'</a>';
+			}
+	
+			// Clone
+			if ($user->rights->propal->creer)
+			{
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object='.$object->element.'">'.$langs->trans("ToClone").'</a>';
+			}
+	
+			// Delete
+			if ($user->rights->propal->supprimer)
+			{
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete"';
+				print '>'.$langs->trans('Delete').'</a>';
+			}
+	
+		}
+	
+		print '</div>';
+		print "<br>\n";
+	}
+	
+	if ($action != 'presend')
+	{
+		print '<table width="100%"><tr><td width="50%" valign="top">';
+		print '<a name="builddoc"></a>'; // ancre
+	
+	
+		/*
+		 * Documents generes
+		 */
+		$filename=dol_sanitizeFileName($object->ref);
+		$filedir=$conf->propal->dir_output . "/" . dol_sanitizeFileName($object->ref);
+		$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
+		$genallowed=$user->rights->propal->creer;
+		$delallowed=$user->rights->propal->supprimer;
+	
+		$var=true;
+	
+		$somethingshown=$formfile->show_documents('propal',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'',0,'',$soc->default_lang);
+	
+	
+		/*
+		 * Linked object block
+		 */
+		$somethingshown=$object->showLinkedObjectBlock();
+	
+		print '</td><td valign="top" width="50%">';
+	
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions=new FormActions($db);
+		$somethingshown=$formactions->showactions($object,'propal',$socid);
+	
+		print '</td></tr></table>';
+	}
+	
+	
+	/*
+	 * Action presend
+	 *
+	 */
+	if ($action == 'presend')
+	{
+		$ref = dol_sanitizeFileName($object->ref);
+	    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	    $fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref, preg_quote($object->ref,'/'));
+	    $file=$fileparams['fullname'];
+	
+	    // Build document if it not exists
+	    if (! $file || ! is_readable($file))
+	    {
+	        // Define output language
+	        $outputlangs = $langs;
+	        $newlang='';
+	        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+	        if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+	        if (! empty($newlang))
+	        {
+	            $outputlangs = new Translate("",$conf);
+	            $outputlangs->setDefaultLang($newlang);
+	        }
+	
+	        $result=propale_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+	        if ($result <= 0)
+	        {
+	            dol_print_error($db,$result);
+	            exit;
+	        }
+	        $fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref, preg_quote($object->ref,'/'));
+	        $file=$fileparams['fullname'];
+	    }
+	
+		print '<br>';
+		print_titre($langs->trans('SendPropalByMail'));
+	
+		// Create form object
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+		$formmail = new FormMail($db);
+		$formmail->fromtype = 'user';
+		$formmail->fromid   = $user->id;
+		$formmail->fromname = $user->getFullName($langs);
+		$formmail->frommail = $user->email;
+		$formmail->withfrom=1;
+		$formmail->withto=empty($_POST["sendto"])?1:$_POST["sendto"];
+		$formmail->withtosocid=$soc->id;
+		$formmail->withtocc=1;
+		$formmail->withtoccsocid=0;
+		$formmail->withtoccc=(! empty($conf->global->MAIN_EMAIL_USECCC)?$conf->global->MAIN_EMAIL_USECCC:false);
+		$formmail->withtocccsocid=0;
+		$formmail->withtopic=$langs->trans('SendPropalRef','__PROPREF__');
+		$formmail->withfile=2;
+		$formmail->withbody=1;
+		$formmail->withdeliveryreceipt=1;
+		$formmail->withcancel=1;
+	
+		// Tableau des substitutions
+		$formmail->substit['__PROPREF__']=$object->ref;
+	    $formmail->substit['__SIGNATURE__']=$user->signature;
+	    $formmail->substit['__PERSONALIZED__']='';
+		// Tableau des parametres complementaires
+		$formmail->param['action']='send';
+		$formmail->param['models']='propal_send';
+		$formmail->param['id']=$object->id;
+		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
+	
+		// Init list of files
+	    if (GETPOST("mode")=='init')
+		{
+			$formmail->clear_attached_files();
+	        $formmail->add_attached_files($file,basename($file),dol_mimetype($file));
+		}
+	
+		$formmail->show_form();
+	
+		print '<br>';
 	}
-
-	$formmail->show_form();
-
-	print '<br>';
 }
 
-
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php
index bd08c74f647..dc447122561 100644
--- a/htdocs/comm/prospect/fiche.php
+++ b/htdocs/comm/prospect/fiche.php
@@ -296,7 +296,7 @@ if ($socid > 0)
 
     if (! empty($conf->propal->enabled) && $user->rights->propale->creer)
     {
-        print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/addpropal.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddProp").'</a>';
+        print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddProp").'</a>';
     }
 
     // Add action
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index c837de7c9fb..5eb0c74a685 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -836,7 +836,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after)
             {
                 $langs->load("propal");
                 $newmenu->add("/comm/propal/index.php?leftmenu=propals", $langs->trans("Prop"), 0, $user->rights->propale->lire, '', $mainmenu, 'propals');
-                $newmenu->add("/societe/societe.php?leftmenu=propals", $langs->trans("NewPropal"), 1, $user->rights->propale->creer);
+                $newmenu->add("/comm/propal.php?action=create&amp;leftmenu=propals", $langs->trans("NewPropal"), 1, $user->rights->propale->creer);
                 $newmenu->add("/comm/propal/list.php?leftmenu=propals", $langs->trans("List"), 1, $user->rights->propale->lire);
                 if ($leftmenu=="propals") $newmenu->add("/comm/propal/list.php?leftmenu=propals&viewstatut=0", $langs->trans("PropalsDraft"), 2, $user->rights->propale->lire);
                 if ($leftmenu=="propals") $newmenu->add("/comm/propal/list.php?leftmenu=propals&viewstatut=1", $langs->trans("PropalsOpened"), 2, $user->rights->propale->lire);
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 9e5f8da0e3b..12b4eb5f472 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -265,7 +265,7 @@ foreach ($listofreferent as $key => $value)
 			{
 				if ($key == 'propal' && ! empty($conf->propal->enabled) && $user->rights->propale->creer)
 				{
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/addpropal.php?socid='.$project->societe->id.'&amp;action=create&amp;origin='.$project->element.'&amp;originid='.$project->id.'">'.$langs->trans("AddProp").'</a>';
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal.php?socid='.$project->societe->id.'&amp;action=create&amp;origin='.$project->element.'&amp;originid='.$project->id.'">'.$langs->trans("AddProp").'</a>';
 				}
 				if ($key == 'order' && ! empty($conf->commande->enabled) && $user->rights->commande->creer)
 				{

From 4a4c7e9ca982c888bff986c25bfd2e6e4eabb929 Mon Sep 17 00:00:00 2001
From: Grand Philippe <contact@atoo-net.com>
Date: Mon, 4 Feb 2013 08:54:04 +0100
Subject: [PATCH 067/162] useless file

---
 htdocs/categories/liste.php | 79 -------------------------------------
 1 file changed, 79 deletions(-)
 delete mode 100644 htdocs/categories/liste.php

diff --git a/htdocs/categories/liste.php b/htdocs/categories/liste.php
deleted file mode 100644
index a4527a56188..00000000000
--- a/htdocs/categories/liste.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/* Copyright (C) 2005      Matthieu Valleton    <mv@seeschloss.org>
- * Copyright (C) 2006-2007 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/>.
- */
-
-/**
- *    \file       htdocs/categories/liste.php
- *    \ingroup    category
- *    \brief      Page liste des categories
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-
-if (!$user->rights->categorie->lire) accessforbidden();
-
-
-llxHeader("","",$langs->trans("Categories"));
-
-print_fiche_titre($langs->trans("CatList"));
-
-print '<table border="0" width="100%" class="notopnoleftnoright">';
-
-print '<tr><td valign="top" width="30%" class="notopnoleft">';
-
-$c = new Categorie($db);
-$cats = $c->get_all_categories();
-
-
-if ($cats != -1)
-{
-    print '<table class="noborder" width="100%">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("Ref").'</td>';
-    print '<td>'.$langs->trans("Description").'</td>';
-    print '<td align="right">'.$langs->trans("Type").'</td>';
-    print '</tr>';
-
-    $var=true;
-    foreach ($cats as $cat)
-    {
-        $var = ! $var;
-        print "\t<tr ".$bc[$var].">\n";
-        print "\t\t<td><a href='viewcat.php?id=".$cat->id."'>".$cat->label."</a></td>\n";
-        print "\t\t<td>".dol_trunc($cat->description,36)."</td>\n";
-        print '<td align="right">';
-        if ($cat->type == 0) print $langs->trans("Product");
-        elseif ($cat->type == 1) print $langs->trans("Supplier");
-        elseif ($cat->type == 2) print $langs->trans("Customer");
-        else print $cat->type;
-        print "</td>\n";
-        print "\t</tr>\n";
-    }
-    print "</table>";
-}
-else
-{
-    dol_print_error();
-}
-
-print '</td></tr></table>';
-
-$db->close();
-
-llxFooter();
-?>

From b492c7e75456107dc6e4083ff0541e8a2fccb894 Mon Sep 17 00:00:00 2001
From: Grand Philippe <contact@atoo-net.com>
Date: Mon, 4 Feb 2013 09:53:42 +0100
Subject: [PATCH 068/162] fix some translations

---
 htdocs/langs/fr_FR/admin.lang | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index f9ffd05c060..75518421e5a 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -313,7 +313,7 @@ FirstnameNamePosition=Ordre affichage prénom/nom
 DescWeather=Les graphiques suivant seront affichées sur le tableau de bord si le nombre d'éléments en retard atteints ces valeurs:
 KeyForWebServicesAccess=Clé pour utiliser les Web Services (paramètre "dolibarrkey" dans les webservices)
 TestSubmitForm=Formulaire de test de saisie
-ThisForceAlsoTheme=Utiliser ce gestionnaire de menu force aussi le theme quelquesoit le choix de theme de l'utilisateur. De plus, ce gestionnaire de menu, spécialisé pour smartphone, ne fonctionne que sur certains téléphones. Utiliser un autre gestionnaire si vous constatez des problèmes.
+ThisForceAlsoTheme=Utiliser ce gestionnaire de menu force aussi le thème quelque soit le choix de thème de l'utilisateur. De plus, ce gestionnaire de menu, spécialisé pour smartphone, ne fonctionne que sur certains téléphones. Utilisez un autre gestionnaire si vous constatez des problèmes.
 ThemeDir=Répertoire des thèmes
 ConnectionTimeout=Timeout de connexion
 ResponseTimeout=Timeout de réponse
@@ -445,7 +445,7 @@ Module1200Desc= Interface avec le bug tracking Mantis
 Module1400Name= Comptabilité
 Module1400Desc= Gestion de la comptabilité (doubles parties)
 Module1780Name= Catégories
-Module1780Desc= Gestion des catégories (produits, fournisseurs et clients)
+Module1780Desc= Gestion des catégories (produits, fournisseurs, clients et adhérents)
 Module2000Name= Editeur WYSIWYG
 Module2000Desc= Permet la saisie de certaines zones de textes grace à un éditeur avancé
 Module2200Name= Droit de prêts
@@ -458,6 +458,8 @@ Module2500Name= Gestion Electronique de Documents
 Module2500Desc= Permet de stocker et administrer une base de documents
 Module2600Name= WebServices
 Module2600Desc= Active le serveur de Web Services de Dolibarr
+Module2650Name= Ultimatepdf
+Module2650Desc= Gestion de la présentation des modèles de pdf (propales, factures, commandes etc...)
 Module2700Name= Gravatar
 Module2700Desc= Utilise le service en ligne Gravatar (www.gravatar.com) pour afficher les photos d'utilisateurs/membres (qui se trouvent avec leurs e-mails). Besoin d'un accès Internet
 Module2900Name= GeoIPMaxmind
@@ -943,7 +945,7 @@ TranslationSetup=Translation setup
 TranslationDesc=Le choix de la langue affichée à l'écran se modifie:<br>* Soit de manière globale depuis le menu <strong>Accueil - Configuration - Affichage</strong><br>* Soit de manière spécifique à l'utilisateur depuis l'onglet <strong>Interface utilisateur</strong> de sa fiche utilisateur (cliquer sur le login en haut de l'écran). 
 ClassNotFoundIntoPathWarning=La class %s n'a pas été trouvée dans le path PHP
 YesInSummer=Oui en été
-OnlyFollowingModulesAreOpenedToExternalUsers=Remarque, seuls les modules suivants sont ouverts aux utilisateurs externes (quelquesoit les permissions de ces utilisateurs):
+OnlyFollowingModulesAreOpenedToExternalUsers=Remarque, seuls les modules suivants sont ouverts aux utilisateurs externes (quelque soit les permissions de ces utilisateurs):
 
 ##### Module password generation= undefined
 PasswordGenerationStandard= Renvoie un mot de passe généré selon algorithme interne Dolibarr: 8 caractères, chiffres et caractères en minuscules mélangés.

From 7c458777cf04922d0796b3ab1b4350ede32de13a Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <mko@atm-consulting.fr>
Date: Mon, 4 Feb 2013 10:21:59 +0100
Subject: [PATCH 069/162] Task # 559 : product customer prices by quantity,
 correction

---
 htdocs/core/class/html.form.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index f31cb0f741e..80859d5d883 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -1171,7 +1171,7 @@ class Form
             $sql.= ", pl.label as label_translated";
         }
 		// Price by quantity
-		if (! empty($conf->global->PRODUIT_PRICE_BY_QTY))
+		if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
 		{
 			$sql.= ", (SELECT pp.rowid FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid";
 			if ($price_level >= 1) $sql.= " AND price_level=".$price_level;

From f084bbbb19bc43783e25ab88afbd225e93d75210 Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Fri, 8 Feb 2013 21:21:25 +0100
Subject: [PATCH 070/162] Update htdocs/product/class/product.class.php

bug on list of childs of product
if two products have the same label, the list display only one line
---
 htdocs/product/class/product.class.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 8f91e30b257..8724671c20d 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2186,7 +2186,7 @@ class Product extends CommonObject
 			}
 
 			// Recursive call
-			if (is_array($desc_pere))
+			if (is_array($desc_pere)>2)
 			{
 				$this ->fetch_prod_arbo($desc_pere, $nom_pere." -> ", $desc_pere[1]*$multiply, $level+1);
 			}
@@ -2340,12 +2340,13 @@ class Product extends CommonObject
 			$prods = array();
 			while ($rec = $this->db->fetch_array($res))
 			{
+				$prods[$rec['rowid']]= array(0=>$rec['id'],1=>$rec['qty'],2=>$rec['fk_product_type'],3=>$this->db->escape($rec['label']));
 				//$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty'],2=>$rec['fk_product_type']);
-				$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty']);
+				//$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty']);
 				$listofchilds=$this->getChildsArbo($rec['id']);
 				foreach($listofchilds as $keyChild => $valueChild)
 				{
-					$prods[$this->db->escape($rec['label'])][$keyChild] = $valueChild;
+					$prods[$rec['rowid']][$keyChild] = $valueChild;
 				}
 			}
 

From caf6fa2240770c418cc199a7d0d7dbf5f6faa7bc Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Sun, 10 Feb 2013 11:09:21 +0100
Subject: [PATCH 071/162] Fix: Amarok login page issues

---
 htdocs/theme/amarok/img/background_login.png | Bin 98985 -> 13346 bytes
 htdocs/theme/amarok/style.css.php            |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 htdocs/theme/amarok/img/background_login.png

diff --git a/htdocs/theme/amarok/img/background_login.png b/htdocs/theme/amarok/img/background_login.png
old mode 100755
new mode 100644
index fd6e78054637eb6730c3b1d7235341ecebe68b65..88594ffd7ca57d9271681be52291a74d08c1563f
GIT binary patch
literal 13346
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

literal 98985
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
M07*qoM6N<$f}S!NJOBUy

diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index 28ba1ef2ec6..115a63d7e66 100755
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -210,8 +210,8 @@ form#login {
 }
 form#login img  {width:auto; height:auto; opacity:.7;}
 form#login img#img_logo {
-	width:220px;
-	max-width:220px;
+	width:190px;
+	max-width:190px;
 	height:auto;
 	border-radius:6px;
 	padding:6px;

From 28fa96b516e651791522e70347e90600ce2d1846 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 Feb 2013 21:56:29 +0100
Subject: [PATCH 072/162] Fix: Bad choice of template

---
 htdocs/fourn/class/fournisseur.facture.class.php | 1 +
 htdocs/fourn/facture/fiche.php                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index e8be8c28323..ffc123fe2de 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -344,6 +344,7 @@ class FactureFournisseur extends CommonInvoice
                 $this->note_private			= $obj->note_private;
                 $this->note_public			= $obj->note_public;
                 $this->model_pdf			= $obj->model_pdf;
+                $this->modelpdf			    = $obj->model_pdf;
                 $this->import_key			= $obj->import_key;
 
                 $this->extraparams			= (array) json_decode($obj->extraparams, true);
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index fd6ffc2efe2..be8b7f6664d 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -2008,7 +2008,7 @@ else
                 $urlsource=$_SERVER['PHP_SELF'].'?id='.$object->id;
                 $genallowed=$user->rights->fournisseur->facture->creer;
                 $delallowed=$user->rights->fournisseur->facture->supprimer;
-                $modelpdf=(! empty($object->modelpdf)?$object->modelpdf:'');
+                $modelpdf=(! empty($object->modelpdf)?$object->modelpdf:(empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF)?'':$conf->global->INVOICE_SUPPLIER_ADDON_PDF));
 
                 print '<br>';
                 print $formfile->showdocuments('facture_fournisseur',$subdir,$filedir,$urlsource,$genallowed,$delallowed,$modelpdf,1,0,0,0,0,'','','',$societe->default_lang);

From e5e9dc404bda4e1ab0a4078037fac14df6598189 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 Feb 2013 21:56:29 +0100
Subject: [PATCH 073/162] Fix: Bad choice of template

---
 htdocs/fourn/class/fournisseur.facture.class.php | 1 +
 htdocs/fourn/facture/fiche.php                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index e8be8c28323..ffc123fe2de 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -344,6 +344,7 @@ class FactureFournisseur extends CommonInvoice
                 $this->note_private			= $obj->note_private;
                 $this->note_public			= $obj->note_public;
                 $this->model_pdf			= $obj->model_pdf;
+                $this->modelpdf			    = $obj->model_pdf;
                 $this->import_key			= $obj->import_key;
 
                 $this->extraparams			= (array) json_decode($obj->extraparams, true);
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 936fbd08572..4b332efcc64 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -2010,7 +2010,7 @@ else
                 $urlsource=$_SERVER['PHP_SELF'].'?id='.$object->id;
                 $genallowed=$user->rights->fournisseur->facture->creer;
                 $delallowed=$user->rights->fournisseur->facture->supprimer;
-                $modelpdf=(! empty($object->modelpdf)?$object->modelpdf:'');
+                $modelpdf=(! empty($object->modelpdf)?$object->modelpdf:(empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF)?'':$conf->global->INVOICE_SUPPLIER_ADDON_PDF));
 
                 print '<br>';
                 print $formfile->showdocuments('facture_fournisseur',$subdir,$filedir,$urlsource,$genallowed,$delallowed,$modelpdf,1,0,0,0,0,'','','',$societe->default_lang);

From 4d9f22c9092b63ab2f34104bbe3240204ebf3ae3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 Feb 2013 22:09:25 +0100
Subject: [PATCH 074/162] Renamed "Salvador" into "El Salvador"

---
 htdocs/langs/es_ES/dict.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/es_ES/dict.lang b/htdocs/langs/es_ES/dict.lang
index bf0b59e3ef1..c0cd7042334 100644
--- a/htdocs/langs/es_ES/dict.lang
+++ b/htdocs/langs/es_ES/dict.lang
@@ -85,7 +85,7 @@ CountryDM=Dominica
 CountryDO=República Dominicana
 CountryEC=Ecuador
 CountryEG=Egipto
-CountrySV=Salvador
+CountrySV=El Salvador
 CountryGQ=Guinea Ecuatorial
 CountryER=Eritrea
 CountryEE=Estonia

From 77c5eaa726a45765df3f8a16dc0c63f8379ffcc9 Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Sun, 10 Feb 2013 11:09:21 +0100
Subject: [PATCH 075/162] Fix: Amarok login page issues

---
 htdocs/theme/amarok/img/background_login.png | Bin 98985 -> 13346 bytes
 htdocs/theme/amarok/style.css.php            |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 htdocs/theme/amarok/img/background_login.png

diff --git a/htdocs/theme/amarok/img/background_login.png b/htdocs/theme/amarok/img/background_login.png
old mode 100755
new mode 100644
index fd6e78054637eb6730c3b1d7235341ecebe68b65..88594ffd7ca57d9271681be52291a74d08c1563f
GIT binary patch
literal 13346
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

literal 98985
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
M07*qoM6N<$f}S!NJOBUy

diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index 28ba1ef2ec6..115a63d7e66 100755
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -210,8 +210,8 @@ form#login {
 }
 form#login img  {width:auto; height:auto; opacity:.7;}
 form#login img#img_logo {
-	width:220px;
-	max-width:220px;
+	width:190px;
+	max-width:190px;
 	height:auto;
 	border-radius:6px;
 	padding:6px;

From d2275a0bbd77e45b818e2f3f7896927367e8aa11 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Feb 2013 20:26:01 +0100
Subject: [PATCH 076/162] New: Add param to show title

---
 htdocs/core/class/html.formactions.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 76e8fbc0f68..514ffb6eab5 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -135,9 +135,10 @@ class FormActions
      *  @param	Object	$object			Object
      *  @param  string	$typeelement	'invoice','propal','order','invoice_supplier','order_supplier','fichinter'
      *	@param	int		$socid			socid of user
+     *  @param	int		$forceshowtitle	Show title even if there is no actions to show
      *	@return	int						<0 if KO, >=0 if OK
      */
-    function showactions($object,$typeelement,$socid=0)
+    function showactions($object,$typeelement,$socid=0,$forceshowtitle=0)
     {
         global $langs,$conf,$user;
         global $bc;
@@ -148,7 +149,7 @@ class FormActions
 		if (! is_array($listofactions)) dol_print_error($this->db,'FailedToGetActions');
 
         $num = count($listofactions);
-        if ($num)
+        if ($num || $forceshowtitle)
         {
         	if ($typeelement == 'invoice')   $title=$langs->trans('ActionsOnBill');
         	elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title=$langs->trans('ActionsOnBill');

From c7a6ee492db155eddd1f5b319423cc9aade5c681 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Feb 2013 20:45:36 +0100
Subject: [PATCH 077/162] New: Add push from Philippe to manager user
 hierarchy.

---
 htdocs/user/class/user.class.php | 235 +++++++++++++++++++++++++++++--
 1 file changed, 220 insertions(+), 15 deletions(-)

diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 5b018a768ed..5d0fd96f4bc 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2005      Lionel Cousteix      <etm_ltd@tiscali.co.uk>
  * Copyright (C) 2011      Herve Prot           <herve.prot@symeos.com>
+ * Copyright (C) 2013      Philippe Grand       <philippe.grand@atoo-net.com>
  *
  * 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
@@ -75,6 +76,7 @@ class User extends CommonObject
 	var $contact_id;
 
 	var $fk_member;
+	var $fk_user;
 
 	var $webcal_login;
 	var $phenix_login;
@@ -91,9 +93,11 @@ class User extends CommonObject
 	var $all_permissions_are_loaded;	/**< \private all_permissions_are_loaded */
 	private $_tab_loaded=array();		// Array of cache of already loaded permissions
 
-	var $conf;           // To store personal config
-	var $oldcopy;                // To contains a clone of this when we need to save old properties of object
+	var $conf;           			// To store personal config
+	var $oldcopy;                	// To contains a clone of this when we need to save old properties of object
 
+	var $users;						// To store all tree of users hierarchy
+	var $parentof;					// To store an array of all parents for all ids.
 
 
 	/**
@@ -139,7 +143,7 @@ class User extends CommonObject
 		$sql = "SELECT u.rowid, u.name, u.firstname, u.email, u.job, u.signature, u.office_phone, u.office_fax, u.user_mobile,";
 		$sql.= " u.admin, u.login, u.webcal_login, u.phenix_login, u.phenix_pass, u.note,";
 		$sql.= " u.pass, u.pass_crypted, u.pass_temp,";
-		$sql.= " u.fk_societe, u.fk_socpeople, u.fk_member, u.ldap_sid,";
+		$sql.= " u.fk_societe, u.fk_socpeople, u.fk_member, u.fk_user, u.ldap_sid,";
 		$sql.= " u.statut, u.lang, u.entity,";
 		$sql.= " u.datec as datec,";
 		$sql.= " u.tms as datem,";
@@ -221,8 +225,7 @@ class User extends CommonObject
 				$this->societe_id           = $obj->fk_societe;
 				$this->contact_id           = $obj->fk_socpeople;
 				$this->fk_member            = $obj->fk_member;
-
-				if (! $this->lang) $this->lang='fr_FR';
+				$this->fk_user        		= $obj->fk_user;
 
 				$this->db->free($result);
 			}
@@ -993,11 +996,11 @@ class User extends CommonObject
 		if ($result > 0)
 		{
 			$result=$this->setPassword($user,$this->pass);
-			if ($member->fk_soc) { 
+			if ($member->fk_soc) {
 				$sql = "UPDATE ".MAIN_DB_PREFIX."user";
 				$sql.= " SET fk_societe=".$member->fk_soc;
 				$sql.= " WHERE rowid=".$this->id;
-	
+
 				dol_syslog(get_class($this)."::create_from_member sql=".$sql, LOG_DEBUG);
 				$resql=$this->db->query($sql);
 				if ($resql)
@@ -1009,7 +1012,7 @@ class User extends CommonObject
 				{
 					$this->error=$this->db->error();
 					dol_syslog(get_class($this)."::create_from_member - 1 - ".$this->error, LOG_ERR);
-	
+
 					$this->db->rollback();
 					return -1;
 				}
@@ -1069,7 +1072,7 @@ class User extends CommonObject
 	}
 
 	/**
-	 *  	Update a user into databse (and also password if this->pass is defined)
+	 *  	Update a user into database (and also password if this->pass is defined)
 	 *
 	 *		@param	User	$user				User qui fait la mise a jour
 	 *    	@param  int		$notrigger			1 ne declenche pas les triggers, 0 sinon
@@ -1153,7 +1156,7 @@ class User extends CommonObject
 				{
 					// Si mot de passe saisi et different de celui en base
 					$result=$this->setPassword($user,$this->pass,0,$notrigger,$nosyncmemberpass);
-					if (! $nbrowsaffected) $nbrowsaffected++; 
+					if (! $nbrowsaffected) $nbrowsaffected++;
 				}
 			}
 
@@ -1268,7 +1271,7 @@ class User extends CommonObject
 	}
 
 	/**
-	 *    Mise e jour en base de la date de deniere connexion d'un utilisateur
+	 *    Mise a jour en base de la date de derniere connexion d'un utilisateur
 	 *	  Fonction appelee lors d'une nouvelle connexion
 	 *
 	 *    @return     <0 si echec, >=0 si ok
@@ -2074,7 +2077,8 @@ class User extends CommonObject
 	 * Update user using data from the LDAP
 	 * // TODO: Voir pourquoi le update met à jour avec toutes les valeurs vide (global $user écrase ?)
 	 */
-	function update_ldap2dolibarr(&$ldapuser) {
+	function update_ldap2dolibarr(&$ldapuser)
+	{
 		global $user, $conf;
 
 		$this->firstname=$ldapuser->{$conf->global->LDAP_FIELD_FIRSTNAME};
@@ -2091,13 +2095,214 @@ class User extends CommonObject
 
 		$this->job=$ldapuser->{$conf->global->LDAP_FIELD_TITLE};
 		$this->note=$ldapuser->{$conf->global->LDAP_FIELD_DESCRIPTION};
-		
+
 		$result = $this->update($user);
-		
+
 		dol_syslog(get_class($this)."::update_ldap2dolibarr result=".$result, LOG_DEBUG);
-		
+
 		return $result;
 	}
+
+
+	/**
+	 * Return and array with all instanciated children users of current user
+	 *
+	 * @return	void
+	 */
+	function get_children()
+	{
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."user";
+		$sql.= " WHERE fk_user = ".$this->id;
+
+		dol_syslog(get_class($this)."::get_children result=".$result, LOG_DEBUG);
+		$res  = $this->db->query($sql);
+		if ($res)
+		{
+			$users = array ();
+			while ($rec = $this->db->fetch_array($res))
+			{
+				$user = new User($this->db);
+				$user->fetch($rec['rowid']);
+				$users[] = $user;
+			}
+			return $users;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
+
+	/**
+	 * 	Load this->parentof that is array(id_son=>id_parent, ...)
+	 *
+	 *	@return		int		<0 if KO, >0 if OK
+	 */
+	private function load_parentof()
+	{
+		global $conf;
+
+		$this->parentof=array();
+
+		// Load array[child]=parent
+		$sql = "SELECT fk_user as id_parent, rowid as id_son";
+		$sql.= " FROM ".MAIN_DB_PREFIX."user";
+		$sql.= " WHERE fk_user != 0";
+		$sql.= " AND entity = ".$conf->entity;
+
+		dol_syslog(get_class($this)."::load_parentof sql=".$sql);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			while ($obj= $this->db->fetch_object($resql))
+			{
+				$this->parentof[$obj->id_son]=$obj->id_parent;
+			}
+			return 1;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
+	/**
+	 * 	Reconstruit l'arborescence hierarchique des users sous la forme d'un tableau
+	 *	Renvoi un tableau de tableau('id','id_parent',...) trie selon arbre et avec:
+	 *				id = id du user
+	 *				id_parent = id du user parent
+	 *				id_children = tableau des id enfant
+	 *				name = nom du user
+	 *				fullname = nom avec chemin complet du user
+	 *				fullpath = chemin complet compose des id
+	 *
+	 *  @param      int		$markafterid      Removed all users including the leaf $markafterid in user tree.
+	 *	@return		array		      		  Array of users. this->users and this->parentof are set.
+	 */
+	function get_full_tree($markafterid=0)
+	{
+		$this->users = array();
+
+		// Init this->parentof that is array(id_son=>id_parent, ...)
+		$this->load_parentof();
+
+		// Init $this->users array
+		$sql = "SELECT DISTINCT u.rowid, u.firstname, u.name, u.fk_user";	// Distinct reduce pb with old tables with duplicates
+		$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
+		$sql.= " WHERE u.entity IN (".getEntity('user',1).")";
+
+		dol_syslog(get_class($this)."::get_full_tree get user list sql=".$sql, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$i=0;
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$this->users[$obj->rowid]['rowid'] = $obj->rowid;
+				$this->users[$obj->rowid]['id'] = $obj->rowid;
+				$this->users[$obj->rowid]['fk_user'] = $obj->fk_parent;
+				$this->users[$obj->rowid]['firstname'] = $obj->firstname;
+				$this->users[$obj->rowid]['name'] = $obj->name;
+				$i++;
+			}
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
+
+		// We add the fullpath property to each elements of first level (no parent exists)
+		dol_syslog(get_class($this)."::get_full_tree call to build_path_from_id_user", LOG_DEBUG);
+		foreach($this->users as $key => $val)
+		{
+			$this->build_path_from_id_user($key,0);	// Process a branch from the root user key (this user has no parent)
+		}
+
+		// Exclude leaf including $markafterid from tree
+		if ($markafterid)
+		{
+			//print "Look to discard user ".$markafterid."\n";
+			$keyfilter1='^'.$markafterid.'$';
+			$keyfilter2='_'.$markafterid.'$';
+			$keyfilter3='^'.$markafterid.'_';
+			$keyfilter4='_'.$markafterid.'_';
+			foreach($this->users as $key => $val)
+			{
+				if (preg_match('/'.$keyfilter1.'/',$val['fullpath']) || preg_match('/'.$keyfilter2.'/',$val['fullpath'])
+					|| preg_match('/'.$keyfilter3.'/',$val['fullpath']) || preg_match('/'.$keyfilter4.'/',$val['fullpath']))
+				{
+					unset($this->users[$key]);
+				}
+			}
+		}
+
+		dol_syslog(get_class($this)."::get_full_tree dol_sort_array", LOG_DEBUG);
+		$this->users=dol_sort_array($this->users, 'fullname', 'asc', true, false);
+
+		//$this->debug_users();
+
+		return $this->users;
+	}
+
+	/**
+	 *	For user id_user and its childs available in this->users, define property fullpath and fullname
+	 *
+	 * 	@param		int		$id_user		id_user entry to update
+	 * 	@param		int		$protection		Deep counter to avoid infinite loop
+	 *	@return		void
+	 */
+	function build_path_from_id_user($id_user,$protection=1000)
+	{
+		dol_syslog(get_class($this)."::build_path_from_id_user id_user=".$id_user." protection=".$protection, LOG_DEBUG);
+
+		if (! empty($this->users[$id_user]['fullpath']))
+		{
+			// Already defined
+			dol_syslog(get_class($this)."::build_path_from_id_user fullpath and fullname already defined", LOG_WARNING);
+			return;
+		}
+
+		// Define fullpath and fullname
+		$this->users[$id_user]['fullpath'] = '_'.$id_user;
+		$this->users[$id_user]['fullname'] = $this->users[$id_user]['label'];
+		$i=0; $cursor_user=$id_user;
+
+		while ((empty($protection) || $i < $protection) && ! empty($this->parentof[$cursor_user]))
+		{
+			$this->users[$id_user]['fullpath'] = '_'.$this->parentof[$cursor_user].$this->users[$id_user]['fullpath'];
+			$this->users[$id_user]['fullname'] = $this->users[$this->parentof[$cursor_user]]['label'].' >> '.$this->users[$id_user]['fullname'];
+			$i++; $cursor_user=$this->parentof[$cursor_user];
+		}
+
+		// We count number of _ to have level
+		$this->users[$id_user]['level']=dol_strlen(preg_replace('/[^_]/i','',$this->users[$id_user]['fullpath']));
+
+		return;
+	}
+
+	/**
+	 *	Affiche contenu de $this->users
+	 *
+	 *	@return	void
+	 */
+	function debug_users()
+	{
+		// Affiche $this->users
+		foreach($this->users as $key => $val)
+		{
+			print 'id: '.$this->users[$key]['id'];
+			print ' name: '.$this->users[$key]['name'];
+			print ' parent: '.$this->users[$key]['fk_parent'];
+			print ' fullpath: '.$this->users[$key]['fullpath'];
+			print ' fullname: '.$this->users[$key]['fullname'];
+			print "<br>\n";
+		}
+	}
+
 }
 
 ?>

From 935f2d9bd8b3b8a7473f216fccfad4c2ea0a307a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Feb 2013 21:23:25 +0100
Subject: [PATCH 078/162] Add TODO

---
 htdocs/filefunc.inc.php | 1 +
 htdocs/main.inc.php     | 2 ++
 htdocs/master.inc.php   | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index d5efaa8f22f..77df6da4f8f 100755
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -106,6 +106,7 @@ if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey='';
 if (empty($dolibarr_main_limit_users)) $dolibarr_main_limit_users=0;
 if (empty($dolibarr_mailing_limit_sendbyweb)) $dolibarr_mailing_limit_sendbyweb=0;
 if (empty($dolibarr_strict_mode)) $dolibarr_strict_mode=0; // For debug in php strict mode
+// TODO Multicompany Remove this. Useless.
 if (empty($multicompany_transverse_mode)) $multicompany_transverse_mode=0;
 if (empty($multicompany_force_entity)) $multicompany_force_entity=0; // To force entity in login page
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index f7081340f8a..202a7c0dfb1 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -584,6 +584,7 @@ if (! defined('NOLOGIN'))
         }
 
         // Create entity cookie, just used for login page
+        // TODO Multicompany Move this into hook
         if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_COOKIE_ENABLED) && isset($_POST["entity"]))
         {
             include_once DOL_DOCUMENT_ROOT.'/core/class/cookie.class.php';
@@ -754,6 +755,7 @@ else
 $heightforframes=52;
 
 // Switch to another entity
+// TODO Multicompany Remove this
 if (! empty($conf->multicompany->enabled) && GETPOST('action') == 'switchentity')
 {
     if ($mc->switchEntity(GETPOST('entity','int')) > 0)
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 41bfa6d3a91..b62ee1c9371 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -75,6 +75,7 @@ if (! empty($dolibarr_main_document_root_alt))
 }
 
 // Set properties specific to multicompany
+// TODO Multicompany Remove this. Useless. Var should be read when required.
 $conf->multicompany->transverse_mode = empty($multicompany_transverse_mode)?'':$multicompany_transverse_mode;		// Force Multi-Company transverse mode
 $conf->multicompany->force_entity = empty($multicompany_force_entity)?'':(int) $multicompany_force_entity;			// Force entity in login page
 
@@ -141,6 +142,7 @@ if (! defined('NOREQUIREDB'))
 	{
 		$conf->entity = DOLENTITY;
 	}
+	// TODO Multicompany Remove this.
 	else if (! empty($conf->multicompany->force_entity) && is_int($conf->multicompany->force_entity)) // To force entity in login page
 	{
 		$conf->entity = $conf->multicompany->force_entity;

From 82dda5723b9431c10b4d1ca04464ae806860cea4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 Feb 2013 01:29:26 +0100
Subject: [PATCH 079/162] Fix: Disable autocomplete

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

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index dcf5d97ea56..60e8f79274c 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -110,7 +110,7 @@ $(document).ready(function () {
 <!-- Password -->
 <tr><td valign="top" nowrap="nowrap"> &nbsp; <strong><label for="password"><?php echo $langs->trans('Password'); ?></label></strong> &nbsp; </td>
 <td valign="top" nowrap="nowrap">
-<input id="password" name="password" class="flat" type="password" size="15" maxlength="30" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" />
+<input id="password" name="password" class="flat" type="password" size="15" maxlength="30" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="off" />
 </td></tr>
 
 <?php

From d8d4b669ab32087131224143dddcd6b65177ce64 Mon Sep 17 00:00:00 2001
From: fhenry <florian.henry@open-concept.pro>
Date: Tue, 12 Feb 2013 09:49:27 +0100
Subject: [PATCH 080/162] Task [ task #711 ]

---
 htdocs/core/class/html.form.class.php | 15 ++++++++--
 htdocs/langs/en_US/admin.lang         |  1 +
 htdocs/langs/fr_FR/admin.lang         |  1 +
 htdocs/societe/admin/societe.php      | 43 +++++++++++++++++++++++++++
 4 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index f31cb0f741e..71673aca078 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -823,11 +823,13 @@ class Form
      *	@param	string	$showfunction   Add function into label
      *	@param	string	$moreclass		Add more class to class style
      *	@param	string	$showsoc	    Add company into label
+     * 	@param	int		$forcecombo		Force to use combo box
+     *  @param	array	$event			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
      *	@return	int						<0 if KO, Nb of contact in list if OK
      */
-    function select_contacts($socid,$selected='',$htmlname='contactid',$showempty=0,$exclude='',$limitto='',$showfunction=0, $moreclass='', $showsoc=0)
+    function select_contacts($socid,$selected='',$htmlname='contactid',$showempty=0,$exclude='',$limitto='',$showfunction=0, $moreclass='', $showsoc=0, $forcecombo=0, $event=array())
     {
-    	print $this->selectcontacts($socid,$selected,$htmlname,$showempty,$exclude,$limitto,$showfunction, $moreclass, $showsoc);
+    	print $this->selectcontacts($socid,$selected,$htmlname,$showempty,$exclude,$limitto,$showfunction, $moreclass, $showsoc, $forcecombo, $event);
     	return $this->num;
     }
 
@@ -844,9 +846,11 @@ class Form
      *	@param	string	$moreclass		Add more class to class style
      *	@param	bool	$options_only	Return options only (for ajax treatment)
      *	@param	string	$showsoc	    Add company into label
+     * 	@param	int		$forcecombo		Force to use combo box
+     *  @param	array	$event			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
      *	@return	 int						<0 if KO, Nb of contact in list if OK
      */
-    function selectcontacts($socid,$selected='',$htmlname='contactid',$showempty=0,$exclude='',$limitto='',$showfunction=0, $moreclass='', $options_only=false, $showsoc=0)
+    function selectcontacts($socid,$selected='',$htmlname='contactid',$showempty=0,$exclude='',$limitto='',$showfunction=0, $moreclass='', $options_only=false, $showsoc=0, $forcecombo=0, $event=array())
     {
         global $conf,$langs;
 
@@ -872,6 +876,11 @@ class Form
         if ($resql)
         {
             $num=$this->db->num_rows($resql);
+            
+            if ($conf->use_javascript_ajax && $conf->global->CONTACT_USE_SEARCH_TO_SELECT && ! $forcecombo)
+            {
+            	$out.= ajax_combobox($htmlname, $event);
+            }
 
             if ($htmlname != 'none' || $options_only) $out.= '<select class="flat'.($moreclass?' '.$moreclass:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
             if ($showempty == 1) $out.= '<option value="0"'.($selected=='0'?' selected="selected"':'').'></option>';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 0fafedaf2b0..42924eb253f 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -50,6 +50,7 @@ DisableJavascript=Disable JavaScript and Ajax functions
 ConfirmAjax=Use Ajax confirmation popups
 UseSearchToSelectCompany=Use autocompletion fields to choose third parties (instead of using a list box).<br><br>Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant SOCIETE_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it
+UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).<br><br>Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 SearchFilter=Search filters options
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 ViewFullDateActions=Show full dates events in the third sheet
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index f9ffd05c060..3d0e9b1562b 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -49,6 +49,7 @@ DisableJavascript= Désactiver les fonctions Javascript et Ajax
 ConfirmAjax= Utiliser les popups de confirmation Ajax
 UseSearchToSelectCompany= Utiliser un champ avec autocomplétion pour choisir un tiers (plutôt qu'une liste déroulante).<br><br>Notez que si vous avez un nombre important de produits ou services (> 100 000), vous pouvez améliorer les performances en définissant la constante SOCIETE_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limitée au début de la chaine.
 ActivityStateToSelectCompany= Ajouter une option de filtrage lors des recherches pour afficher/masquer les tiers en exercice ou ayant cessés d'exercer
+UseSearchToSelectContact= Utiliser un champ avec autocomplétion pour choisir un contact (plutôt qu'une liste déroulante).<br><br>Notez que si vous avez un nombre important de produits ou services (> 100 000), vous pouvez améliorer les performances en définissant la constante CONTACT_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limitée au début de la chaine.
 SearchFilter=Options des filtres de recherche
 NumberOfKeyToSearch=Nb carac. déclenchant recherche: %s
 ViewFullDateActions= Visualiser les dates des actions en entier dans la fiche tiers
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 3bb95dd10ee..1b0efa2c4b2 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -82,6 +82,21 @@ if ($action == 'COMPANY_USE_SEARCH_TO_SELECT')
 	}
 }
 
+if ($action == 'CONTACT_USE_SEARCH_TO_SELECT')
+{
+	$contactsearch = GETPOST('activate_CONTACT_USE_SEARCH_TO_SELECT','alpha');
+	$res = dolibarr_set_const($db, "CONTACT_USE_SEARCH_TO_SELECT", $contactsearch,'chaine',0,'',$conf->entity);
+	if (! $res > 0) $error++;
+	if (! $error)
+	{
+		$mesg = "<font class=\"ok\">".$langs->trans("SetupSaved")."</font>";
+	}
+	else
+	{
+		$mesg = "<font class=\"error\">".$langs->trans("Error")."</font>";
+	}
+}
+
 // Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
 if ($action == 'setModuleOptions')
 {
@@ -647,9 +662,37 @@ else
 print '</tr>';
 print '</form>';
 
+
+$var=!$var;
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="CONTACT_USE_SEARCH_TO_SELECT">';
+print "<tr ".$bc[$var].">";
+print '<td width="80%">'.$langs->trans("UseSearchToSelectContact").'</td>';
+if (! $conf->use_javascript_ajax)
+{
+	print '<td nowrap="nowrap" align="right" colspan="2">';
+	print $langs->trans("NotAvailableWhenAjaxDisabled");
+	print "</td>";
+}
+else
+{
+	print '<td width="60" align="right">';
+	$arrval=array('0'=>$langs->trans("No"),
+	'1'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",1).')',
+	'2'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",2).')',
+	'3'=>$langs->trans("Yes").' ('.$langs->trans("NumberOfKeyToSearch",3).')',
+	);
+	print $form->selectarray("activate_CONTACT_USE_SEARCH_TO_SELECT",$arrval,$conf->global->CONTACT_USE_SEARCH_TO_SELECT);
+	print '</td><td align="right">';
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print "</td>";
+}
+print '</tr>';
 print '</table>';
 
 
+
 dol_fiche_end();
 
 $db->close();

From af849a5ab05aac93f23b96ee3bee03c9d8eff903 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Tue, 12 Feb 2013 10:33:10 +0100
Subject: [PATCH 081/162] fix contact address autofill

---
 htdocs/contact/fiche.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 9097584bfb5..2926ec75b75 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -383,7 +383,7 @@ else
 							});
 
 							$("#copyaddressfromsoc").click(function() {
-								$(\'textarea[name="address"]\').text("'.dol_escape_js($objsoc->address).'");
+								$(\'textarea[name="address"]\').val("'.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).'");

From 112526e8b1a11665af5b99855cf4a140ad0b8ab9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 Feb 2013 14:48:12 +0100
Subject: [PATCH 082/162] Fix: bad translation

---
 htdocs/langs/en_US/agenda.lang | 2 +-
 htdocs/langs/fr_FR/agenda.lang | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 3d180e7b747..2355c112194 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -15,7 +15,7 @@ MyEvents=My events
 OtherEvents=Other events
 ListOfActions=List of events
 Location=Location
-EventOnFullDay=Event on full day
+EventOnFullDay=Event on all day(s)
 SearchAnAction= Search an event/task
 MenuToDoActions= All incomplete events
 MenuDoneActions= All terminated events
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index d91f836d9b9..33555be6951 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Nombre d'événements
 MyEvents=Mes événements
 OtherEvents=Autres événements
 ListOfActions=Liste des événements
-EventOnFullDay=Événement sur la journée
+EventOnFullDay=Événement sur la(les) journée(s)
 Location=Lieu
 SearchAnAction=Rechercher un événement/tâche
 MenuToDoActions=Les événem. incomplets

From 8a72ff8fc22070882d013d32a5e9f3a1057c1ea0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 Feb 2013 14:48:12 +0100
Subject: [PATCH 083/162] Fix: bad translation

---
 htdocs/langs/en_US/agenda.lang | 2 +-
 htdocs/langs/fr_FR/agenda.lang | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 3d180e7b747..2355c112194 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -15,7 +15,7 @@ MyEvents=My events
 OtherEvents=Other events
 ListOfActions=List of events
 Location=Location
-EventOnFullDay=Event on full day
+EventOnFullDay=Event on all day(s)
 SearchAnAction= Search an event/task
 MenuToDoActions= All incomplete events
 MenuDoneActions= All terminated events
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index d91f836d9b9..33555be6951 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -14,7 +14,7 @@ EventsNb=Nombre d'événements
 MyEvents=Mes événements
 OtherEvents=Autres événements
 ListOfActions=Liste des événements
-EventOnFullDay=Événement sur la journée
+EventOnFullDay=Événement sur la(les) journée(s)
 Location=Lieu
 SearchAnAction=Rechercher un événement/tâche
 MenuToDoActions=Les événem. incomplets

From ddf27b2c67131b85c96e79306d8618ba0c7cf617 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 Feb 2013 15:01:16 +0100
Subject: [PATCH 084/162] Fix Bug 708

---
 htdocs/comm/action/fiche.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index 37b01f22f49..79500a94fd0 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -185,7 +185,7 @@ if ($action == 'add_action')
 	if (! empty($conf->phenix->enabled) && GETPOST('add_phenix') == 'on') $actioncomm->use_phenix=1;
 
 	// Check parameters
-	if ($actioncomm->type_code == 'AC_RDV' && ($datep == '' || $datef == ''))
+	if ($actioncomm->type_code == 'AC_RDV' && ($datep == '' || ($datef == '' && empty($fulldayevent))))
 	{
 		$error++;
 		$action = 'create';
@@ -561,7 +561,7 @@ if ($action == 'create')
 		} else {
 			print $form->select_company('','socid','',1,1);
 		}
-		
+
 	}
 	print '</td></tr>';
 

From 6ad617842d8d71530c5c61fe1863d253a96faed8 Mon Sep 17 00:00:00 2001
From: fhenry <florian.henry@open-concept.pro>
Date: Tue, 12 Feb 2013 15:31:12 +0100
Subject: [PATCH 085/162] Commit temporaire

---
 htdocs/comm/fiche.php                         | 30 +++++++++
 htdocs/comm/prospect/class/prospect.class.php |  6 +-
 htdocs/societe/class/societe.class.php        | 67 +++++++++++++++++++
 3 files changed, 100 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index 84987129be3..8b840353d8a 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -27,10 +27,15 @@
  *       \brief      Page to show customer card of a third party
  */
 
+error_reporting(E_ALL);
+ini_set('display_errors', true);
+ini_set('html_errors', false);
+
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 if (! empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
@@ -109,6 +114,15 @@ if ($action == 'setassujtva' && $user->rights->societe->creer)
 	if (! $result) dol_print_error($result);
 }
 
+// set prospect level
+if ($action == 'setprospectlevel' && $user->rights->societe->creer)
+{
+	$object->fetch($socid);
+	$object->fk_prospectlevel=GETPOST('prospect_level_id','int');
+	$object->set_prospect_level($user);
+	if ($result < 0) setEventMessage($object->error,'errors');
+}
+
 
 
 /*
@@ -121,6 +135,7 @@ llxHeader('',$langs->trans('CustomerCard'));
 $contactstatic = new Contact($db);
 $userstatic=new User($db);
 $form = new Form($db);
+$formcompany=new FormCompany($db);
 
 
 if ($mode == 'search')
@@ -359,6 +374,21 @@ if ($id > 0)
 		print '</td><td colspan="3">'.$object->price_level."</td>";
 		print '</tr>';
 	}
+	
+	// Level of prospect
+	print '<tr><td nowrap>';
+	print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
+	print $langs->trans('ProspectLevelShort');
+	print '<td>';
+	if ($action != 'editlevel' && $user->rights->societe->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;socid='.$object->id.'">'.img_edit($langs->trans('Modify'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="3">';
+	if ($action == 'editlevel')
+		$formcompany->form_prospect_level($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->fk_prospectlevel,'prospect_level_id',1);
+	else
+		print $object->getLibProspLevel();
+	print "</td>";
+	print '</tr>';
 
 	// Sales representative
 	include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
diff --git a/htdocs/comm/prospect/class/prospect.class.php b/htdocs/comm/prospect/class/prospect.class.php
index 68440aa0b84..ec0454c4847 100644
--- a/htdocs/comm/prospect/class/prospect.class.php
+++ b/htdocs/comm/prospect/class/prospect.class.php
@@ -148,9 +148,9 @@ class Prospect extends Societe
 	 *
 	 *  @return     string        Libelle
 	 */
-	function getLibLevel()
+	function getLibProspLevel()
 	{
-		return $this->LibLevel($this->fk_prospectlevel);
+		return $this->LibProspLevel($this->fk_prospectlevel);
 	}
 
 	/**
@@ -159,7 +159,7 @@ class Prospect extends Societe
 	 *  @param	int		$fk_prospectlevel   	Prospect level
 	 *  @return string        					Libelle du niveau
 	 */
-	function LibLevel($fk_prospectlevel)
+	function LibProspLevel($fk_prospectlevel)
 	{
 		global $langs;
 
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index db147ffde86..7dd0a6b1ff7 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2655,6 +2655,73 @@ class Societe extends CommonObject
 		    return false;
 
 	}
+	
+	/**
+	 *	Return prostect level 
+	 *
+	 *  @return     string        Libelle
+	 */
+	function getLibProspLevel()
+	{
+		return $this->LibProspLevel($this->fk_prospectlevel);
+	}
+	
+	/**
+	 *  Return label of prospect level
+	 *
+	 *  @param	int		$fk_prospectlevel   	Prospect level
+	 *  @return string        					label of level
+	 */
+	function LibProspLevel($fk_prospectlevel)
+	{
+		global $langs;
+	
+		$lib=$langs->trans("ProspectLevel".$fk_prospectlevel);
+		// If lib not found in language file, we get label from cache/databse
+		if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel))
+		{
+			$lib=$langs->getLabelFromKey($this->db,$fk_prospectlevel,'c_prospectlevel','code','label');
+		}
+		return $lib;
+	}
+	
+	
+	/**
+	 *  Definit la societe comme un client
+	 *
+	 *  @param	float	$remise		Valeur en % de la remise
+	 *  @param  string	$note		Note/Motif de modification de la remise
+	 *  @param  User	$user		Utilisateur qui definie la remise
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	function set_prospect_level($user)
+	{
+		global $langs;
+	
+		if ($this->id)
+		{
+			$this->db->begin();
+	
+			$now=dol_now();
+	
+			// Positionne remise courante
+			$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET ";
+			$sql.= "	fk_prospectlevel='".$this->fk_prospectlevel."'";
+			$sql.= "	,fk_user_modif='".$user->id."'";
+			$sql.= " WHERE rowid = ".$this->id;
+			dol_syslog(get_class($this)."::set_prospect_level sql=".$sql);
+			$resql=$this->db->query($sql);
+			if (! $resql)
+			{
+				$this->db->rollback();
+				$this->error=$this->db->error();
+				return -1;
+			}
+	
+			$this->db->commit();
+			return 1;
+		}
+	}
 
 }
 

From 3eb485d52123662da44a8ffbc240a72306c00968 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 12 Feb 2013 17:08:21 +0100
Subject: [PATCH 086/162] Qual: Removed TODO, deprecated code and deprecated
 properties. This also fix missing combo box of contacts onto CC.

---
 htdocs/comm/propal.php                    | 193 +++++++++++-----------
 htdocs/commande/fiche.php                 |   9 +-
 htdocs/compta/facture.php                 |   9 +-
 htdocs/core/class/html.formmail.class.php |  29 +---
 htdocs/expedition/fiche.php               |   9 +-
 htdocs/fichinter/fiche.php                |   9 +-
 htdocs/fourn/commande/fiche.php           |   9 +-
 htdocs/fourn/facture/fiche.php            |   9 +-
 8 files changed, 123 insertions(+), 153 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index cd2f44878ed..cc34443a622 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (! empty($conf->projet->enabled)) 
+if (! empty($conf->projet->enabled))
 {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
@@ -260,7 +260,7 @@ else if ($action == 'add' && $user->rights->propal->creer)
 		$action='create';
 		$error++;
 	}
-	
+
 	if ($socid<1)
 	{
 		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Customer")),'errors');
@@ -1174,7 +1174,7 @@ $now=dol_now();
 if ($action == 'create')
 {
 	print_fiche_titre($langs->trans("NewProp"));
-	
+
 	$soc = new Societe($db);
 	if ($socid>0) $res=$soc->fetch($socid);
 
@@ -1214,7 +1214,7 @@ if ($action == 'create')
 	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">';
-	
+
 	if ($origin != 'project' && $originid)
 	{
 		print '<input type="hidden" name="origin" value="'.$origin.'">';
@@ -1459,20 +1459,20 @@ if ($action == 'create')
 
 	print "</form>";
 }
-else 
+else
 {
 	/*
 	 * Show object in view mode
 	 */
-	
+
 	$soc = new Societe($db);
 	$soc->fetch($object->socid);
-	
+
 	$head = propal_prepare_head($object);
 	dol_fiche_head($head, 'comm', $langs->trans('Proposal'), 0, 'propal');
-	
+
 	$formconfirm='';
-	
+
 	// Clone confirmation
 	if ($action == 'clone')
 	{
@@ -1486,30 +1486,30 @@ else
 		// Paiement incomplet. On demande si motif = escompte ou autre
 		$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('ClonePropal'),$langs->trans('ConfirmClonePropal',$object->ref),'confirm_clone',$formquestion,'yes',1);
 	}
-	
+
 	// Confirm delete
 	else if ($action == 'delete')
 	{
 		$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteProp'), $langs->trans('ConfirmDeleteProp',$object->ref), 'confirm_delete','',0,1);
 	}
-	
+
 	// Confirm reopen
 	else if ($action == 'reopen')
 	{
 		$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReOpen'), $langs->trans('ConfirmReOpenProp',$object->ref), 'confirm_reopen','',0,1);
 	}
-	
+
 	// Confirmation delete product/service line
 	else if ($action == 'ask_deleteline')
 	{
 		$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline','',0,1);
 	}
-	
+
 	// Confirm validate proposal
 	else if ($action == 'validate')
 	{
 	    $error=0;
-	
+
 		// on verifie si l'objet est en numerotation provisoire
 		$ref = substr($object->ref, 1, 4);
 		if ($ref == 'PROV')
@@ -1525,7 +1525,7 @@ else
 		{
 			$numref = $object->ref;
 		}
-	
+
 		$text=$langs->trans('ConfirmValidateProp',$numref);
 		if (! empty($conf->notification->enabled))
 		{
@@ -1534,29 +1534,29 @@ else
 			$text.='<br>';
 			$text.=$notify->confirmMessage('NOTIFY_VAL_PROPAL',$object->socid);
 		}
-	
+
 		if (! $error) $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateProp'), $text, 'confirm_validate','',0,1);
 	}
-	
+
 	if (! $formconfirm)
 	{
 	    $parameters=array('lineid'=>$lineid);
 	    $formconfirm=$hookmanager->executeHooks('formConfirm',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 	}
-	
+
 	// Print form confirm
 	print $formconfirm;
-	
-	
+
+
 	print '<table class="border" width="100%">';
-	
+
 	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/propal/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
-	
+
 	// Ref
 	print '<tr><td>'.$langs->trans('Ref').'</td><td colspan="5">';
 	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
 	print '</td></tr>';
-	
+
 	// Ref client
 	print '<tr><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td nowrap="nowrap">';
@@ -1580,11 +1580,11 @@ else
 	}
 	print '</td>';
 	print '</tr>';
-	
+
 	// Company
 	print '<tr><td>'.$langs->trans('Company').'</td><td colspan="5">'.$soc->getNomUrl(1).'</td>';
 	print '</tr>';
-	
+
 	// Ligne info remises tiers
 	print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="5">';
 	if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client);
@@ -1614,7 +1614,7 @@ else
 	}
 	if (! $absolute_discount && ! $absolute_creditnote) print $langs->trans("CompanyHasNoAbsoluteDiscount").'.';
 	print '</td></tr>';
-	
+
 	// Date of proposal
 	print '<tr>';
 	print '<td>';
@@ -1645,7 +1645,7 @@ else
 		}
 	}
 	print '</td>';
-	
+
 	// Date end proposal
 	print '<tr>';
 	print '<td>';
@@ -1678,7 +1678,7 @@ else
 	}
 	print '</td>';
 	print '</tr>';
-	
+
 	// Payment term
 	print '<tr><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
@@ -1697,7 +1697,7 @@ else
 	}
 	print '</td>';
 	print '</tr>';
-	
+
 	// Delivery date
 	$langs->load('deliveries');
 	print '<tr><td>';
@@ -1722,7 +1722,7 @@ else
 	}
 	print '</td>';
 	print '</tr>';
-	
+
 	// Delivery delay
 	print '<tr><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
@@ -1740,10 +1740,10 @@ else
 	{
 		$form->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'none',1);
 	}
-	
+
 	print '</td>';
 	print '</tr>';
-	
+
 	// Origin of demand
 	print '<tr><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
@@ -1761,10 +1761,10 @@ else
 	{
 		$form->form_demand_reason($_SERVER['PHP_SELF'].'?id='.$object->id,$object->demand_reason_id,'none');
 	}
-	
+
 	print '</td>';
 	print '</tr>';
-	
+
 	// Payment mode
 	print '<tr>';
 	print '<td width="25%">';
@@ -1783,7 +1783,7 @@ else
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->mode_reglement_id,'none');
 	}
 	print '</td></tr>';
-	
+
 	// Project
 	if (! empty($conf->projet->enabled))
 	{
@@ -1825,7 +1825,7 @@ else
 		}
 		print '</tr>';
 	}
-	
+
 	// Other attributes
 	$parameters=array('colspan' => ' colspan="3"');
 	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
@@ -1841,12 +1841,12 @@ else
 	        print '</td></tr>'."\n";
 	    }
 	}
-	
+
 	// Amount HT
 	print '<tr><td height="10">'.$langs->trans('AmountHT').'</td>';
 	print '<td align="right" nowrap><b>'.price($object->total_ht).'</b></td>';
 	print '<td>'.$langs->trans("Currency".$conf->currency).'</td>';
-	
+
 	// Margin Infos
 	if (! empty($conf->margin->enabled)) {
 	  print '<td valign="top" width="50%" rowspan="4">';
@@ -1854,12 +1854,12 @@ else
 	  print '</td>';
 	}
 	print '</tr>';
-	
+
 	// Amount VAT
 	print '<tr><td height="10">'.$langs->trans('AmountVAT').'</td>';
 	print '<td align="right" nowrap>'.price($object->total_tva).'</td>';
 	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-	
+
 	// Amount Local Taxes
 	if ($mysoc->localtax1_assuj=="1") //Localtax1
 	{
@@ -1873,55 +1873,55 @@ else
 		print '<td align="right" nowrap>'.price($object->total_localtax2).'</td>';
 		print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
 	}
-	
-	
+
+
 	// Amount TTC
 	print '<tr><td height="10">'.$langs->trans('AmountTTC').'</td>';
 	print '<td align="right" nowrap>'.price($object->total_ttc).'</td>';
 	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
-	
+
 	// Statut
 	print '<tr><td height="10">'.$langs->trans('Status').'</td><td align="left" colspan="2">'.$object->getLibStatut(4).'</td></tr>';
-	
+
 	print '</table><br>';
-	
+
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
 	{
 		$blocname = 'contacts';
 		$title = $langs->trans('ContactsAddresses');
 		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 	}
-	
+
 	if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 		$blocname = 'notes';
 		$title = $langs->trans('Notes');
 		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 	}
-	
+
 	/*
 	 * Lines
 	 */
-	
+
 	if (! empty($conf->use_javascript_ajax) && $object->statut == 0)
 	{
 		include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 	}
-	
+
 	print '<table id="tablelines" class="noborder" width="100%">';
-	
+
 	// Show object lines
 	$result = $object->getLinesArray();
 	if (! empty($object->lines))
 		$ret=$object->printObjectLines($action,$mysoc,$soc,$lineid);
-	
+
 	// Form to add new line
 	if ($object->statut == 0 && $user->rights->propal->creer)
 	{
 		if ($action != 'editline')
 		{
 			$var=true;
-	
+
 			if ($conf->global->MAIN_FEATURES_LEVEL > 1)
 			{
 				// Add free or predefined products/services
@@ -1931,7 +1931,7 @@ else
 			{
 				// Add free products/services
 				$object->formAddFreeProduct(0,$mysoc,$soc);
-	
+
 				// Add predefined products/services
 				if (! empty($conf->product->enabled) || ! empty($conf->service->enabled))
 				{
@@ -1939,17 +1939,17 @@ else
 					$object->formAddPredefinedProduct(0,$mysoc,$soc);
 				}
 			}
-	
+
 			$parameters=array();
 			$reshook=$hookmanager->executeHooks('formAddObjectLine',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 		}
 	}
-	
+
 	print '</table>';
-	
+
 	print '</div>';
 	print "\n";
-	
+
 	if ($action == 'statut')
 	{
 		/*
@@ -1975,18 +1975,18 @@ else
 		$form_close.= '<a name="close">&nbsp;</a>';
 		$form_close.= '</td>';
 		$form_close.= '</tr></table></form>';
-	
+
 		print $form_close;
 	}
-	
-	
+
+
 	/*
 	 * Boutons Actions
 	 */
 	if ($action != 'presend')
 	{
 		print '<div class="tabsAction">';
-	
+
 		if ($action != 'statut' && $action <> 'editline')
 		{
 			// Validate
@@ -1995,20 +1995,20 @@ else
 			    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>';
 			}
-	
+
 			// Edit
 			if ($object->statut == 1 && $user->rights->propal->creer)
 			{
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=modif">'.$langs->trans('Modify').'</a>';
 			}
-	
+
 			// ReOpen
 			if (($object->statut == 2 || $object->statut == 3) && $user->rights->propal->cloturer)
 			{
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen'.(empty($conf->global->MAIN_JUMP_TAG)?'':'#reopen').'"';
 				print '>'.$langs->trans('ReOpen').'</a>';
 			}
-	
+
 			// Send
 			if ($object->statut == 1 || $object->statut == 2)
 			{
@@ -2018,7 +2018,7 @@ else
 	            }
 	            else print '<a class="butActionRefused" href="#">'.$langs->trans('SendByMail').'</a>';
 			}
-	
+
 	        // Create an order
 	        if (! empty($conf->commande->enabled) && $object->statut == 2 && $user->societe_id == 0)
 	        {
@@ -2027,7 +2027,7 @@ else
 	                print '<a class="butAction" href="'.DOL_URL_ROOT.'/commande/fiche.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddOrder").'</a>';
 	            }
 	        }
-	
+
 	        // Create an invoice and classify billed
 			if ($object->statut == 2 && $user->societe_id == 0)
 			{
@@ -2035,46 +2035,46 @@ else
 				{
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddBill").'</a>';
 				}
-	
+
 				$arraypropal=$object->getInvoiceArrayList();
 				if (is_array($arraypropal) && count($arraypropal) > 0)
 				{
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled&amp;socid='.$object->socid.'">'.$langs->trans("ClassifyBilled").'</a>';
 				}
 			}
-	
+
 			// Close
 			if ($object->statut == 1 && $user->rights->propal->cloturer)
 			{
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=statut'.(empty($conf->global->MAIN_JUMP_TAG)?'':'#close').'"';
 				print '>'.$langs->trans('Close').'</a>';
 			}
-	
+
 			// Clone
 			if ($user->rights->propal->creer)
 			{
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object='.$object->element.'">'.$langs->trans("ToClone").'</a>';
 			}
-	
+
 			// Delete
 			if ($user->rights->propal->supprimer)
 			{
 				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete"';
 				print '>'.$langs->trans('Delete').'</a>';
 			}
-	
+
 		}
-	
+
 		print '</div>';
 		print "<br>\n";
 	}
-	
+
 	if ($action != 'presend')
 	{
 		print '<table width="100%"><tr><td width="50%" valign="top">';
 		print '<a name="builddoc"></a>'; // ancre
-	
-	
+
+
 		/*
 		 * Documents generes
 		 */
@@ -2083,28 +2083,28 @@ else
 		$urlsource=$_SERVER["PHP_SELF"]."?id=".$object->id;
 		$genallowed=$user->rights->propal->creer;
 		$delallowed=$user->rights->propal->supprimer;
-	
+
 		$var=true;
-	
+
 		$somethingshown=$formfile->show_documents('propal',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'',0,'',$soc->default_lang);
-	
-	
+
+
 		/*
 		 * Linked object block
 		 */
 		$somethingshown=$object->showLinkedObjectBlock();
-	
+
 		print '</td><td valign="top" width="50%">';
-	
+
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions=new FormActions($db);
 		$somethingshown=$formactions->showactions($object,'propal',$socid);
-	
+
 		print '</td></tr></table>';
 	}
-	
-	
+
+
 	/*
 	 * Action presend
 	 *
@@ -2115,7 +2115,7 @@ else
 	    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	    $fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref, preg_quote($object->ref,'/'));
 	    $file=$fileparams['fullname'];
-	
+
 	    // Build document if it not exists
 	    if (! $file || ! is_readable($file))
 	    {
@@ -2129,7 +2129,7 @@ else
 	            $outputlangs = new Translate("",$conf);
 	            $outputlangs->setDefaultLang($newlang);
 	        }
-	
+
 	        $result=propale_pdf_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	        if ($result <= 0)
 	        {
@@ -2139,10 +2139,10 @@ else
 	        $fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref, preg_quote($object->ref,'/'));
 	        $file=$fileparams['fullname'];
 	    }
-	
+
 		print '<br>';
 		print_titre($langs->trans('SendPropalByMail'));
-	
+
 		// Create form object
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 		$formmail = new FormMail($db);
@@ -2151,18 +2151,17 @@ else
 		$formmail->fromname = $user->getFullName($langs);
 		$formmail->frommail = $user->email;
 		$formmail->withfrom=1;
-		$formmail->withto=empty($_POST["sendto"])?1:$_POST["sendto"];
-		$formmail->withtosocid=$soc->id;
-		$formmail->withtocc=1;
-		$formmail->withtoccsocid=0;
+		$liste=array();
+		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
+		$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
+		$formmail->withtocc=$liste;
 		$formmail->withtoccc=(! empty($conf->global->MAIN_EMAIL_USECCC)?$conf->global->MAIN_EMAIL_USECCC:false);
-		$formmail->withtocccsocid=0;
 		$formmail->withtopic=$langs->trans('SendPropalRef','__PROPREF__');
 		$formmail->withfile=2;
 		$formmail->withbody=1;
 		$formmail->withdeliveryreceipt=1;
 		$formmail->withcancel=1;
-	
+
 		// Tableau des substitutions
 		$formmail->substit['__PROPREF__']=$object->ref;
 	    $formmail->substit['__SIGNATURE__']=$user->signature;
@@ -2172,16 +2171,16 @@ else
 		$formmail->param['models']='propal_send';
 		$formmail->param['id']=$object->id;
 		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	
+
 		// Init list of files
 	    if (GETPOST("mode")=='init')
 		{
 			$formmail->clear_attached_files();
 	        $formmail->add_attached_files($file,basename($file),dol_mimetype($file));
 		}
-	
+
 		$formmail->show_form();
-	
+
 		print '<br>';
 	}
 }
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index ccaadefe2ee..03dde1a24ff 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -2418,12 +2418,11 @@ if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! G
 				$formmail->fromname = $user->getFullName($langs);
 				$formmail->frommail = $user->email;
 				$formmail->withfrom=1;
-				$formmail->withto=GETPOST('sendto')?GETPOST('sendto'):1;
-				$formmail->withtosocid=$soc->id;
-				$formmail->withtocc=1;
-				$formmail->withtoccsocid=0;
+				$liste=array();
+				foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
+				$formmail->withto=GETPOST('sendto')?GETPOST('sendto'):$liste;
+				$formmail->withtocc=$liste;
 				$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-				$formmail->withtocccsocid=0;
 				$formmail->withtopic=$langs->trans('SendOrderRef','__ORDERREF__');
 				$formmail->withfile=2;
 				$formmail->withbody=1;
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 4295e1f6fa9..bccac8d8354 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3403,12 +3403,11 @@ else if ($id > 0 || ! empty($ref))
             $formmail->fromname = $user->getFullName($langs);
             $formmail->frommail = $user->email;
             $formmail->withfrom=1;
-            $formmail->withto=empty($_POST["sendto"])?1:$_POST["sendto"];
-            $formmail->withtosocid=$soc->id;
-            $formmail->withtocc=1;
-            $formmail->withtoccsocid=0;
+			$liste=array();
+			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
+			$formmail->withto=GETPOST('sendto')?GETPOST('sendto'):$liste;
+            $formmail->withtocc=$liste;
             $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-            $formmail->withtocccsocid=0;
             $formmail->withtopic=$langs->transnoentities($topicmail,'__FACREF__');
             $formmail->withfile=2;
             $formmail->withbody=1;
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index f499bcb6b68..bca6463055b 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -49,6 +49,7 @@ class FormMail
     var $withto;
     var $withtofree;
     var $withtocc;
+    var $withtoccc;
     var $withtopic;
     var $withfile;				// 0=No attaches files, 1=Show attached files, 2=Can add new attached files
     var $withbody;
@@ -428,23 +429,11 @@ class FormMail
         		else
         		{
         			$out.= '<input size="'.(is_array($this->withtocc)?"30":"60").'" id="sendtocc" name="sendtocc" value="'.((! is_array($this->withtocc) && ! is_numeric($this->withtocc))? (isset($_POST["sendtocc"])?$_POST["sendtocc"]:$this->withtocc) : (isset($_POST["sendtocc"])?$_POST["sendtocc"]:"") ).'" />';
-        			if (! empty($this->withto) && is_array($this->withto))
+        			if (! empty($this->withtocc) && is_array($this->withtocc))
         			{
         				$out.= " ".$langs->trans("or")." ";
         				$out.= $form->selectarray("receivercc", $this->withto, GETPOST("receivercc"), 1);
         			}
-        			if (! empty($this->withtoccsocid) && $this->withtoccsocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
-        			{
-        				$liste=array();
-        				$soc=new Societe($this->db);
-        				$soc->fetch($this->withtoccsocid);
-        				foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
-        				{
-        					$liste[$key]=$value;
-        				}
-        				$out.= " ".$langs->trans("or")." ";
-        				$out.= $form->selectarray("receivercc", $liste, GETPOST("receivercc"), 1);
-        			}
         		}
         		$out.= "</td></tr>\n";
         	}
@@ -462,23 +451,11 @@ class FormMail
         		else
         		{
         			$out.= '<input size="'.(is_array($this->withtoccc)?"30":"60").'" id="sendtoccc" name="sendtoccc" value="'.((! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))? (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:$this->withtoccc) : (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:"") ).'" />';
-        			if (! empty($this->withto) && is_array($this->withto))
+        			if (! empty($this->withtoccc) && is_array($this->withtoccc))
         			{
         				$out.= " ".$langs->trans("or")." ";
         				$out.= $form->selectarray("receiverccc", $this->withto, GETPOST("receiverccc"), 1);
         			}
-        			if (! empty($this->withtocccsocid) && $this->withtocccsocid > 0) // deprecated. TODO Remove this. Instead, fill withto with array before calling method.
-        			{
-        				$liste=array();
-        				$soc=new Societe($this->db);
-        				$soc->fetch($this->withtosocid);
-        				foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
-        				{
-        					$liste[$key]=$value;
-        				}
-        				$out.= " ".$langs->trans("or")." ";
-        				$out.= $form->selectarray("receiverccc", $liste, GETPOST("receiverccc"), 1);
-        			}
         		}
         		//if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print ' '.info_admin("+ ".$conf->global->MAIN_MAIL_AUTOCOPY_TO,1);
         		$out.= "</td></tr>\n";
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index 90850fce683..21289f60864 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -1443,12 +1443,11 @@ else
             $formmail->fromname = $user->getFullName($langs);
             $formmail->frommail = $user->email;
             $formmail->withfrom=1;
-            $formmail->withto=GETPOST('sendto','int')?GETPOST('sendto','int'):1;
-            $formmail->withtosocid=$soc->id;
-            $formmail->withtocc=1;
-            $formmail->withtoccsocid=0;
+			$liste=array();
+			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
+			$formmail->withto=GETPOST("sendto")?GETOST("sendto"):$liste;
+			$formmail->withtocc=$liste;
             $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-            $formmail->withtocccsocid=0;
             $formmail->withtopic=$langs->trans('SendShippingRef','__SHIPPINGREF__');
             $formmail->withfile=2;
             $formmail->withbody=1;
diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index 11e1eabd782..b2db591eefc 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -1487,12 +1487,11 @@ else if ($id > 0 || ! empty($ref))
         $formmail->fromname = $user->getFullName($langs);
         $formmail->frommail = $user->email;
         $formmail->withfrom=1;
-        $formmail->withto=(!GETPOST('sendto','alpha'))?1:GETPOST('sendto','alpha');
-        $formmail->withtosocid=$societe->id;
-        $formmail->withtocc=1;
-        $formmail->withtoccsocid=0;
+		$liste=array();
+		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
+		$formmail->withto=GETPOST("sendto")?GETOST("sendto"):$liste;
+		$formmail->withtocc=$liste;
         $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-        $formmail->withtocccsocid=0;
         $formmail->withtopic=$langs->trans('SendInterventionRef','__FICHINTERREF__');
         $formmail->withfile=2;
         $formmail->withbody=1;
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index ee802c3dc0f..24ecd0690b0 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -1819,12 +1819,11 @@ if (! empty($object->id))
 		$formmail->fromname = $user->getFullName($langs);
 		$formmail->frommail = $user->email;
 		$formmail->withfrom=1;
-		$formmail->withto=empty($_POST["sendto"])?1:$_POST["sendto"];
-		$formmail->withtosocid=$object->thirdparty->id;
-		$formmail->withtocc=1;
-		$formmail->withtoccsocid=0;
+		$liste=array();
+		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
+		$formmail->withto=GETPOST("sendto")?GETOST("sendto"):$liste;
+		$formmail->withtocc=$liste;
 		$formmail->withtoccc=(! empty($conf->global->MAIN_EMAIL_USECCC)?$conf->global->MAIN_EMAIL_USECCC:false);
-		$formmail->withtocccsocid=0;
 		$formmail->withtopic=$langs->trans('SendOrderRef','__ORDERREF__');
 		$formmail->withfile=2;
 		$formmail->withbody=1;
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index be8b7f6664d..571742a977d 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -2075,12 +2075,11 @@ else
             $formmail->fromname = $user->getFullName($langs);
             $formmail->frommail = $user->email;
             $formmail->withfrom=1;
-            $formmail->withto=empty($_POST["sendto"])?1:$_POST["sendto"];
-            $formmail->withtosocid=$societe->id;
-            $formmail->withtocc=1;
-            $formmail->withtoccsocid=0;
+			$liste=array();
+			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
+			$formmail->withto=GETPOST("sendto")?GETOST("sendto"):$liste;
+			$formmail->withtocc=$liste;
             $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-            $formmail->withtocccsocid=0;
             $formmail->withtopic=$langs->trans('SendBillRef','__FACREF__');
             $formmail->withfile=2;
             $formmail->withbody=1;

From 82fc8e1536adc6831c1420ae45c3edb1a9a3fd8c Mon Sep 17 00:00:00 2001
From: fhenry <florian.henry@open-concept.pro>
Date: Tue, 12 Feb 2013 19:16:48 +0100
Subject: [PATCH 087/162] Task 350 in Doliforge

---
 htdocs/comm/contact.php                |   7 +-
 htdocs/comm/fiche.php                  |  34 ++-
 htdocs/comm/index.php                  |   4 +-
 htdocs/comm/propal/list.php            |   9 +-
 htdocs/comm/prospect/fiche.php         | 343 -------------------------
 htdocs/contact/list.php                |   7 +-
 htdocs/core/boxes/box_prospect.php     |   4 +-
 htdocs/core/lib/company.lib.php        |  11 +-
 htdocs/societe/class/societe.class.php | 142 ++++++++--
 9 files changed, 155 insertions(+), 406 deletions(-)
 delete mode 100644 htdocs/comm/prospect/fiche.php

diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 114fc6398e0..98f12489fea 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -55,16 +55,11 @@ $result = restrictedArea($user, 'societe',$socid,'');
 
 llxHeader('','Contacts');
 
-if ($type == "c")
+if ($type == "c" || $type == "p")
 {
   $label = $langs->trans("Customers");
   $urlfiche="fiche.php";
 }
-if ($type == "p")
-{
-  $label = $langs->trans("Prospects");
-  $urlfiche="prospect/fiche.php";
-}
 if ($type == "f")
 {
   $label = $langs->trans("Suppliers");
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index 8b840353d8a..397fb9da835 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -27,10 +27,6 @@
  *       \brief      Page to show customer card of a third party
  */
 
-error_reporting(E_ALL);
-ini_set('display_errors', true);
-ini_set('html_errors', false);
-
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -117,9 +113,18 @@ if ($action == 'setassujtva' && $user->rights->societe->creer)
 // set prospect level
 if ($action == 'setprospectlevel' && $user->rights->societe->creer)
 {
-	$object->fetch($socid);
-	$object->fk_prospectlevel=GETPOST('prospect_level_id','int');
-	$object->set_prospect_level($user);
+	$object->fetch($id);
+	$object->fk_prospectlevel=GETPOST('prospect_level_id','alpha');
+	$result=$object->set_prospect_level($user);
+	if ($result < 0) setEventMessage($object->error,'errors');
+}
+
+// Update communication level
+if ($action == 'cstc')
+{
+	$object->fetch($id);
+	$object->stcomm_id=GETPOST('stcomm','int');
+	$result=$object->set_commnucation_level($user);
 	if ($result < 0) setEventMessage($object->error,'errors');
 }
 
@@ -191,6 +196,11 @@ if ($id > 0)
 	$object->next_prev_filter="te.client in (1,3)";
 	print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','','');
 	print '</td></tr>';
+	
+	// Prospect/Customer
+	print '<tr><td width="30%">'.$langs->trans('ProspectCustomer').'</td><td width="70%" colspan="3">';
+	print $object->getLibCustProspStatut();
+	print '</td></tr>';
 
 	// Prefix
     if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
@@ -389,6 +399,16 @@ if ($id > 0)
 		print $object->getLibProspLevel();
 	print "</td>";
 	print '</tr>';
+	
+	// Status
+	print '<tr><td>'.$langs->trans("StatusProsp").'</td><td colspan="2">'.$object->getLibProspCommStatut(4).'</td>';
+	print '<td>';
+	if ($object->stcomm_id != -1) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=-1&amp;action=cstc">'.img_action(0,-1).'</a>';
+	if ($object->stcomm_id !=  0) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=0&amp;action=cstc">'.img_action(0,0).'</a>';
+	if ($object->stcomm_id !=  1) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=1&amp;action=cstc">'.img_action(0,1).'</a>';
+	if ($object->stcomm_id !=  2) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=2&amp;action=cstc">'.img_action(0,2).'</a>';
+	if ($object->stcomm_id !=  3) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=3&amp;action=cstc">'.img_action(0,3).'</a>';
+	print '</td></tr>';
 
 	// Sales representative
 	include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index cc420c48d15..cfcd8ee121c 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -315,9 +315,7 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
 				print '<tr '.$bc[$var].'>';
 				print '<td nowrap="nowrap">'.$companystatic->getNomUrl(1,'customer',48).'</td>';
 				print '<td align="right" nowrap>';
-				if ($objp->client == 2 || $objp->client == 3) print $langs->trans("Prospect");
-				if ($objp->client == 3) print ' / ';
-				if ($objp->client == 1 || $objp->client == 3) print $langs->trans("Customer");
+				print $companystatic->getLibCustProspStatut();
 				print "</td>";
 				print '<td align="right" nowrap>'.dol_print_date($db->jdate($objp->tms),'day')."</td>";
 				print '</tr>';
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index b2f1f8dcc44..4063802ffa4 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -322,14 +322,7 @@ if ($result)
 		print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
 		print '</td></tr></table>';
 
-		if ($objp->client == 1)
-		{
-			$url = DOL_URL_ROOT.'/comm/fiche.php?socid='.$objp->rowid;
-		}
-		else
-		{
-			$url = DOL_URL_ROOT.'/comm/prospect/fiche.php?socid='.$objp->rowid;
-		}
+		$url = DOL_URL_ROOT.'/comm/fiche.php?socid='.$objp->rowid;
 
 		// Company
 		$companystatic->id=$objp->rowid;
diff --git a/htdocs/comm/prospect/fiche.php b/htdocs/comm/prospect/fiche.php
deleted file mode 100644
index dc447122561..00000000000
--- a/htdocs/comm/prospect/fiche.php
+++ /dev/null
@@ -1,343 +0,0 @@
-<?php
-/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- *
- * 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/comm/prospect/fiche.php
- *	\ingroup    prospect
- *	\brief      Page de la fiche prospect
- */
-
-require_once '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/prospect/class/prospect.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-
-$langs->load('companies');
-$langs->load('projects');
-$langs->load('propal');
-
-$action=GETPOST('action', 'alpha');
-
-// Security check
-$socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'societe', $socid, '&societe');
-
-$object = new Prospect($db);
-
-
-/*
- * Actions
- */
-
-if ($action == 'cstc')
-{
-	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm = ".$_GET["stcomm"];
-	$sql .= " WHERE rowid = ".$socid;
-	$db->query($sql);
-}
-// set prospect level
-if ($action == 'setprospectlevel' && $user->rights->societe->creer)
-{
-	$object->fetch($socid);
-	$object->fk_prospectlevel=$_POST['prospect_level_id'];
-	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_prospectlevel='".$_POST['prospect_level_id'];
-	$sql.= " WHERE rowid = ".$socid;
-	$result = $db->query($sql);
-	if (! $result) dol_print_error($result);
-}
-
-
-/*********************************************************************************
- *
- * Mode fiche
- *
- *********************************************************************************/
-
-llxHeader();
-
-$now = dol_now();
-
-$form=new Form($db);
-$formcompany=new FormCompany($db);
-
-if ($socid > 0)
-{
-	$actionstatic=new ActionComm($db);
-	$result = $object->fetch($socid);
-	if ($result < 0)
-	{
-		dol_print_error($db);
-		exit;
-	}
-
-	/*
-	 * Affichage onglets
-	 */
-	$head = societe_prepare_head($object);
-
-	dol_fiche_head($head, 'prospect', $langs->trans("ThirdParty"),0,'company');
-
-	print '<table width="100%" class="notopnoleftnoright">';
-	print '<tr><td valign="top" width="50%" class="notopnoleft">';
-
-	print '<table class="border" width="100%">';
-	print '<tr><td width="25%">'.$langs->trans("ThirdPartyName").'</td><td colspan="3">';
-	$object->next_prev_filter="te.client in (2,3)";
-	print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','','');
-	print '</td></tr>';
-
-	// Address
-	print '<tr><td valign="top">'.$langs->trans("Address").'</td><td colspan="3">';
-	dol_print_address($object->address,'gmap','thirdparty',$object->id);
-	print "</td></tr>";
-
-	// Zip / Town
-	print '<tr><td nowrap="nowrap">'.$langs->trans('Zip').' / '.$langs->trans("Town").'</td><td colspan="3">'.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town.'</td>';
-	print '</tr>';
-
-	// Country
-	print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">';
-	$img=picto_from_langcode($object->country_code);
-	if ($object->isInEEC()) print $form->textwithpicto(($img?$img.' ':'').$object->country,$langs->trans("CountryIsInEEC"),1,0);
-	else print ($img?$img.' ':'').$object->country;
-	print '</td></tr>';
-
-	// Phone
-	print '<tr><td>'.$langs->trans("Phone").'</td><td style="min-width: 25%;">'.dol_print_phone($object->tel,$object->country_code,0,$object->id,'AC_TEL').'</td>';
-	print '<td>'.$langs->trans("Fax").'</td><td style="min-width: 25%;">'.dol_print_phone($object->fax,$object->country_code).'</td></tr>';
-
-	// EMail
-	print '<td>'.$langs->trans('EMail').'</td><td colspan="3">'.dol_print_email($object->email,0,$object->id,'AC_EMAIL').'</td></tr>';
-
-	// Web
-	print '<tr><td>'.$langs->trans("Web")."</td><td colspan=\"3\"><a href=\"http://$object->url\">$object->url</a></td></tr>";
-
-	// Level of prospect
-	print '<tr><td nowrap>';
-	print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
-	print $langs->trans('ProspectLevelShort');
-	print '<td>';
-	if ($action != 'editlevel' && $user->rights->societe->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;socid='.$object->id.'">'.img_edit($langs->trans('Modify'),1).'</a></td>';
-	print '</tr></table>';
-	print '</td><td colspan="3">';
-	if ($action == 'editlevel')
-		$formcompany->form_prospect_level($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->fk_prospectlevel,'prospect_level_id',1);
-	else
-		print $object->getLibLevel();
-	print "</td>";
-	print '</tr>';
-
-	// Multiprice level
-	if (! empty($conf->global->PRODUIT_MULTIPRICES))
-	{
-		print '<tr><td nowrap>';
-		print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
-		print $langs->trans("PriceLevel");
-		print '<td><td align="right">';
-		if ($user->rights->societe->creer)
-		{
-			print '<a href="'.DOL_URL_ROOT.'/comm/multiprix.php?id='.$object->id.'">'.img_edit($langs->trans("Modify")).'</a>';
-		}
-		print '</td></tr></table>';
-		print '</td><td colspan="3">'.$object->price_level."</td>";
-		print '</tr>';
-	}
-
-	// Status
-	print '<tr><td>'.$langs->trans("StatusProsp").'</td><td colspan="2">'.$object->getLibProspStatut(4).'</td>';
-	print '<td>';
-	if ($object->stcomm_id != -1) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=-1&amp;action=cstc">'.img_action(0,-1).'</a>';
-	if ($object->stcomm_id !=  0) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=0&amp;action=cstc">'.img_action(0,0).'</a>';
-	if ($object->stcomm_id !=  1) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=1&amp;action=cstc">'.img_action(0,1).'</a>';
-	if ($object->stcomm_id !=  2) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=2&amp;action=cstc">'.img_action(0,2).'</a>';
-	if ($object->stcomm_id !=  3) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=3&amp;action=cstc">'.img_action(0,3).'</a>';
-	print '</td></tr>';
-
-	// Sales representative
-	include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
-
-    // Module Adherent
-    if (! empty($conf->adherent->enabled))
-    {
-        $langs->load("members");
-        $langs->load("users");
-        print '<tr><td width="25%" valign="top">'.$langs->trans("LinkedToDolibarrMember").'</td>';
-        print '<td colspan="3">';
-        $adh=new Adherent($db);
-        $result=$adh->fetch('','',$object->id);
-        if ($result > 0)
-        {
-            $adh->ref=$adh->getFullName($langs);
-            print $adh->getNomUrl(1);
-        }
-        else
-        {
-            print $langs->trans("UserNotLinkedToMember");
-        }
-        print '</td>';
-        print "</tr>\n";
-    }
-
-	print '</table>';
-
-
-	print "</td>\n";
-	print '<td valign="top" width="50%" class="notopnoleftnoright">';
-
-	// Nbre max d'elements des petites listes
-	$MAXLIST=5;
-	$tableaushown=0;
-
-	// Lien recap
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("Summary").'</td>';
-	print '<td align="right"><a href="'.DOL_URL_ROOT.'/comm/prospect/recap-prospect.php?socid='.$object->id.'">'.$langs->trans("ShowProspectPreview").'</a></td></tr></table></td>';
-	print '</tr>';
-	print '</table>';
-	print '<br>';
-
-
-	/*
-	 * Last proposals
-	 */
-	if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
-	{
-		$propal_static=new Propal($db);
-
-		$sql = "SELECT s.nom, s.rowid as socid, p.rowid as propalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
-		$sql.= " p.datep as dp, p.fin_validite as datelimite,";
-		$sql.= " c.label as statut, c.id as statutid";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-		$sql.= ", ".MAIN_DB_PREFIX."propal as p";
-		$sql.= ", ".MAIN_DB_PREFIX."c_propalst as c";
-		$sql.= " WHERE p.fk_soc = s.rowid";
-		$sql.= " AND p.fk_statut = c.id";
-		$sql.= " AND p.entity = ".$conf->entity;
-		$sql.= " AND s.rowid = ".$object->id;
-		$sql.= " ORDER BY p.datep DESC";
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$var=true;
-			$i = 0;
-			$num = $db->num_rows($resql);
-
-			if ($num > 0)
-			{
-		        print '<table class="noborder" width="100%">';
-			    print '<tr class="liste_titre">';
-    			print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastPropals",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a href="'.DOL_URL_ROOT.'/comm/propal.php?socid='.$object->id.'">'.$langs->trans("AllPropals").' ('.$num.')</a></td>';
-    			print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
-    			print '</tr></table></td>';
-    			print '</tr>';
-			}
-
-			while ($i < $num && $i < $MAXLIST)
-			{
-				$objp = $db->fetch_object($resql);
-				$var=!$var;
-				print "<tr $bc[$var]>";
-				print "<td><a href=\"../propal.php?id=$objp->propalid\">";
-				print img_object($langs->trans("ShowPropal"),"propal");
-				print " ".$objp->ref."</a>\n";
-				if ($db->jdate($objp->dp) < ($now - $conf->propal->cloture->warning_delay) && $objp->fk_statut == 1)
-				{
-					print " ".img_warning();
-				}
-				print "</td><td align=\"right\">".dol_print_date($db->jdate($objp->dp),"day")."</td>\n";
-				print "<td align=\"right\">".price($objp->total_ht)."</td>\n";
-				print "<td align=\"right\">".$propal_static->LibStatut($objp->fk_statut,5)."</td></tr>\n";
-				$i++;
-			}
-			$db->free();
-
-			if ($num > 0) print "</table>";
-		}
-		else
-		{
-			dol_print_error($db);
-		}
-
-	}
-
-	print "</td></tr>";
-	print "</table>\n";
-
-    dol_fiche_end();
-
-	/*
-	 * Barre d'action
-	 */
-
-	print '<div class="tabsAction">';
-
-    if (! empty($conf->propal->enabled) && $user->rights->propale->creer)
-    {
-        print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddProp").'</a>';
-    }
-
-    // Add action
-    if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
-    {
-        if ($user->rights->agenda->myactions->create)
-        {
-            print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/fiche.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a>';
-        }
-        else
-        {
-            print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
-        }
-    }
-
-	print '</div>';
-
-	print '<br>';
-
-
-    if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))
-    {
-        print '<br>';
-        // List of contacts
-        show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
-    }
-
-    if (! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
-    {
-        print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
-
-        // List of todo actions
-        show_actions_todo($conf,$langs,$db,$object);
-
-        // List of done actions
-        show_actions_done($conf,$langs,$db,$object);
-    }
-}
-
-
-llxFooter();
-
-$db->close();
-?>
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 9b3ac059454..fe0187624fe 100755
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -65,16 +65,11 @@ $offset = $limit * $page;
 
 $langs->load("companies");
 $titre = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
-if ($type == "c")
+if ($type == "c" || $type=="p")
 {
 	$titre.='  ('.$langs->trans("ThirdPartyCustomers").')';
 	$urlfiche="fiche.php";
 }
-else if ($type == "p")
-{
-	$titre.='  ('.$langs->trans("ThirdPartyProspects").')';
-	$urlfiche="prospect/fiche.php";
-}
 else if ($type == "f")
 {
 	$titre.=' ('.$langs->trans("ThirdPartySuppliers").')';
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 802fe5ab071..254370a4395 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -89,11 +89,11 @@ class box_prospect extends ModeleBoxes
 
 					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
 			            'logo' => $this->boximg,
-			            'url' => DOL_URL_ROOT."/comm/prospect/fiche.php?socid=".$objp->socid);
+			            'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][1] = array('td' => 'align="left"',
 			            'text' => $objp->nom,
-			            'url' => DOL_URL_ROOT."/comm/prospect/fiche.php?socid=".$objp->socid);
+			            'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
 
 					$this->info_box_contents[$i][2] = array('td' => 'align="right"',
  			           'text' => dol_print_date($datem, "day"));
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 87695a771b3..4fb851ce4d3 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -42,16 +42,7 @@ function societe_prepare_head($object)
     $head[$h][2] = 'card';
     $h++;
 
-    // TODO Remove tests on object->object. Functions must be called with a company object directly
-    if (($object->client==2 || $object->client==3
-    || (isset($object->object) && $object->object->client==2) || (isset($object->object) && $object->object->client==3)) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
-    {
-        $head[$h][0] = DOL_URL_ROOT.'/comm/prospect/fiche.php?socid='.$object->id;
-        $head[$h][1] = $langs->trans("Prospect");
-        $head[$h][2] = 'prospect';
-        $h++;
-    }
-    if ($object->client==1 || $object->client==3 || (isset($object->object) && $object->object->client==1) || (isset($object->object) && $object->object->client==3))
+    if ($object->client==1 || $object->client==2 || $object->client==3 || (isset($object->object) && $object->object->client==1) || (isset($object->object) && $object->object->client==3))
     {
         $head[$h][0] = DOL_URL_ROOT.'/comm/fiche.php?socid='.$object->id;
         $head[$h][1] = $langs->trans("Customer");
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 7dd0a6b1ff7..0f5e7051010 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1437,18 +1437,11 @@ class Societe extends CommonObject
 
         if ($option == 'customer' || $option == 'compta')
         {
-            if (($this->client == 1 || $this->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))  // Only customer
-            {
-                $lien = '<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$this->id;
-            }
-            elseif($this->client == 2 && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))   // Only prospect
-            {
-                $lien = '<a href="'.DOL_URL_ROOT.'/comm/prospect/fiche.php?socid='.$this->id;
-            }
+           $lien = '<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$this->id;
         }
         else if ($option == 'prospect' && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
         {
-            $lien = '<a href="'.DOL_URL_ROOT.'/comm/prospect/fiche.php?socid='.$this->id;
+            $lien = '<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$this->id;
         }
         else if ($option == 'supplier')
         {
@@ -2687,17 +2680,13 @@ class Societe extends CommonObject
 	
 	
 	/**
-	 *  Definit la societe comme un client
+	 *  Set prospect level
 	 *
-	 *  @param	float	$remise		Valeur en % de la remise
-	 *  @param  string	$note		Note/Motif de modification de la remise
 	 *  @param  User	$user		Utilisateur qui definie la remise
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
 	function set_prospect_level($user)
-	{
-		global $langs;
-	
+	{	
 		if ($this->id)
 		{
 			$this->db->begin();
@@ -2706,8 +2695,8 @@ class Societe extends CommonObject
 	
 			// Positionne remise courante
 			$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET ";
-			$sql.= "	fk_prospectlevel='".$this->fk_prospectlevel."'";
-			$sql.= "	,fk_user_modif='".$user->id."'";
+			$sql.= " fk_prospectlevel='".$this->fk_prospectlevel."'";
+			$sql.= ",fk_user_modif='".$user->id."'";
 			$sql.= " WHERE rowid = ".$this->id;
 			dol_syslog(get_class($this)."::set_prospect_level sql=".$sql);
 			$resql=$this->db->query($sql);
@@ -2722,7 +2711,118 @@ class Societe extends CommonObject
 			return 1;
 		}
 	}
-
-}
-
-?>
+	
+	/**
+	 *  Return status of prospect
+	 *
+	 *  @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long
+	 *  @return string        		Libelle
+	 */
+	function getLibProspCommStatut($mode=0)
+	{
+		return $this->LibProspCommStatut($this->stcomm_id,$mode);
+	}
+	
+	/**
+	 *  Return label of a given status
+	 *
+	 *  @param	int		$statut        	Id statut
+	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto
+	 *  @return string        			Libelle du statut
+	 */
+	function LibProspCommStatut($statut,$mode=0)
+	{
+		global $langs;
+		$langs->load('customers');
+	
+		if ($mode == 2)
+		{
+			if ($statut == -1) return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
+			if ($statut ==  0) return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+			if ($statut ==  1) return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+			if ($statut ==  2) return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+			if ($statut ==  3) return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+		}
+		if ($mode == 3)
+		{
+			if ($statut == -1) return img_action($langs->trans("StatusProspect-1"),-1);
+			if ($statut ==  0) return img_action($langs->trans("StatusProspect0"), 0);
+			if ($statut ==  1) return img_action($langs->trans("StatusProspect1"), 1);
+			if ($statut ==  2) return img_action($langs->trans("StatusProspect2"), 2);
+			if ($statut ==  3) return img_action($langs->trans("StatusProspect3"), 3);
+		}
+		if ($mode == 4)
+		{
+			if ($statut == -1) return img_action($langs->trans("StatusProspect-1"),-1).' '.$langs->trans("StatusProspect-1");
+			if ($statut ==  0) return img_action($langs->trans("StatusProspect0"), 0).' '.$langs->trans("StatusProspect0");
+			if ($statut ==  1) return img_action($langs->trans("StatusProspect1"), 1).' '.$langs->trans("StatusProspect1");
+			if ($statut ==  2) return img_action($langs->trans("StatusProspect2"), 2).' '.$langs->trans("StatusProspect2");
+			if ($statut ==  3) return img_action($langs->trans("StatusProspect3"), 3).' '.$langs->trans("StatusProspect3");
+		}
+	
+		return "Error, mode/status not found";
+	}
+	
+	/**
+	 *  Set commnunication level
+	 *
+	 *  @param  User	$user		Utilisateur qui definie la remise
+	 *	@return	int					<0 if KO, >0 if OK
+	 */
+	function set_commnucation_level($user)
+	{	
+		if ($this->id)
+		{
+			$this->db->begin();
+	
+			$now=dol_now();
+	
+			// Positionne remise courante
+			$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET ";
+			$sql.= " fk_stcomm='".$this->stcomm_id."'";
+			$sql.= ",fk_user_modif='".$user->id."'";
+			$sql.= " WHERE rowid = ".$this->id;
+			
+			dol_syslog(get_class($this)."::set_commnucation_level sql=".$sql);
+			$resql=$this->db->query($sql);
+			if (! $resql)
+			{
+				$this->db->rollback();
+				$this->error=$this->db->error();
+				return -1;
+			}
+	
+			$this->db->commit();
+			return 1;
+		}
+	}
+	
+	/**
+	 *    Return label of status customer is prospect/customer
+	 *
+	 *    @return   string        		Libelle
+	 */
+	function getLibCustProspStatut()
+	{
+		return $this->LibCustProspStatut($this->client,$mode);
+	}
+	
+	/**
+	 *  Renvoi le libelle d'un statut donne
+	 *
+	 *  @param	int		$statut         Id statut
+	 *  @return	string          		Libelle du statut
+	 */
+	function LibCustProspStatut($statut)
+	{
+		global $langs;
+		$langs->load('companies');		
+	
+		if ($statut==0) return $langs->trans("NorProspectNorCustomer");
+		if ($statut==1) return $langs->trans("Customer");
+		if ($statut==2) return $langs->trans("Prospect");
+		if ($statut==3) return $langs->trans("ProspectCustomer");
+		
+	}
+	
+}
\ No newline at end of file

From 5c9950f4866bad509d37e378af9fd8d6900eabbd Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Wed, 13 Feb 2013 08:55:16 +0100
Subject: [PATCH 088/162] prepare db for margin on contracts

---
 htdocs/install/mysql/migration/3.3.0-3.4.0.sql | 3 +++
 1 file changed, 3 insertions(+)

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 0a5a4a94642..6f09732d0dc 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
@@ -33,3 +33,6 @@ UPDATE llx_const set value='smartphone_menu.php' where value='smartphone_frontof
 
 ALTER TABLE llx_user add COLUMN fk_user integer;
 
+-- margin on contracts
+alter table llx_contratdet add column fk_product_fournisseur_price int(11) after info_bits;
+alter table llx_contratdet add column buy_price_ht double(24,8) DEFAULT 0 after fk_product_fournisseur_price;
\ No newline at end of file

From b372a8c5baa700264622cdce60486c88eb8286e2 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Wed, 13 Feb 2013 08:59:40 +0100
Subject: [PATCH 089/162] prepare db for margin on contracts

---
 htdocs/install/mysql/tables/llx_contratdet.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql
index e7dc0354aba..11381991015 100644
--- a/htdocs/install/mysql/tables/llx_contratdet.sql
+++ b/htdocs/install/mysql/tables/llx_contratdet.sql
@@ -53,6 +53,8 @@ create table llx_contratdet
   total_localtax2       double(24,8)  DEFAULT 0,	   		   -- Total Local tax 2 de la ligne
   total_ttc             double(24,8)  DEFAULT 0,	   		   -- Total TTC de la ligne toute quantite et incluant remise ligne et globale
   info_bits		          integer       DEFAULT 0, 		       -- TVA NPR ou non
+  fk_product_fournisseur_price int(11) DEFAULT NULL,          -- supplier price id
+  buy_price_ht double(24,8) DEFAULT '0.00000000',             -- buying price
 
   fk_user_author        integer       NOT NULL DEFAULT 0,
   fk_user_ouverture     integer,

From 44134dec57668f4819d723720f0bf15c31af4d79 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Wed, 13 Feb 2013 09:50:08 +0100
Subject: [PATCH 090/162] prepare contract class for margin management

---
 htdocs/contrat/class/contrat.class.php | 61 +++++++++++++++++++++++---
 1 file changed, 54 insertions(+), 7 deletions(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index ee422f4b505..249a4c9dca0 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
  * Copyright (C) 2008		Raphael Bertrand		<raphael.bertrand@resultic.fr>
  * Copyright (C) 2010-2011	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2013     Christophe Battarel  <christophe.battarel@altairis.fr>
  *
  * 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
@@ -27,7 +28,7 @@
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-
+require_once(DOL_DOCUMENT_ROOT ."/margin/lib/margins.lib.php");
 
 /**
  *	Class to manage contracts
@@ -402,7 +403,7 @@ class Contrat extends CommonObject
 
 		// Selectionne les lignes contrats liees a un produit
 		$sql = "SELECT p.label, p.description as product_desc, p.ref,";
-		$sql.= " d.rowid, d.fk_contrat, d.statut, d.description, d.price_ht, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.remise_percent, d.subprice,";
+		$sql.= " d.rowid, d.fk_contrat, d.statut, d.description, d.price_ht, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.remise_percent, d.subprice, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht,";
 		$sql.= " d.total_ht,";
 		$sql.= " d.total_tva,";
 		$sql.= " d.total_localtax1,";
@@ -451,6 +452,10 @@ class Contrat extends CommonObject
 				$line->fk_product		= $objp->fk_product;
 				$line->info_bits		= $objp->info_bits;
 
+				$line->fk_fournprice 	= $objp->fk_fournprice;
+				$marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
+				$line->pa_ht 			= $marginInfos[0];
+
 				$line->fk_user_author	= $objp->fk_user_author;
 				$line->fk_user_ouverture= $objp->fk_user_ouverture;
 				$line->fk_user_cloture  = $objp->fk_user_cloture;
@@ -856,7 +861,7 @@ class Contrat extends CommonObject
 	 * 	@param  int			$info_bits			Bits de type de lignes
 	 *  @return int             				<0 si erreur, >0 si ok
 	 */
-	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type='HT', $pu_ttc=0, $info_bits=0)
+	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type='HT', $pu_ttc=0, $info_bits=0, $fk_fournprice=null, $pa_ht = 0)
 	{
 		global $user, $langs, $conf;
 
@@ -875,6 +880,7 @@ class Contrat extends CommonObject
 			if (! $pu_ttc) $pu_ttc=0;
 			$pu_ht=price2num($pu_ht);
 			$pu_ttc=price2num($pu_ttc);
+			$pa_ht=price2num($pa_ht);
 			$txtva=price2num($txtva);
 			$txlocaltax1=price2num($txlocaltax1);
 			$txlocaltax2=price2num($txlocaltax2);
@@ -908,13 +914,21 @@ class Contrat extends CommonObject
 				$price = $pu_ht - $remise;
 			}
 
+		    if (empty($pa_ht)) $pa_ht=0;
+
+			// si prix d'achat non renseigne et utilise pour calcul des marges alors prix achat = prix vente
+			if ($pa_ht == 0) {
+				if ($pu_ht > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1))
+					$pa_ht = $pu_ht * (1 - $remise_percent / 100);
+			}
+
 			// Insertion dans la base
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."contratdet";
 			$sql.= " (fk_contrat, label, description, fk_product, qty, tva_tx,";
 			$sql.= " localtax1_tx, localtax2_tx, remise_percent, subprice,";
 			$sql.= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc,";
 			$sql.= " info_bits,";
-			$sql.= " price_ht, remise";								// TODO A virer
+			$sql.= " price_ht, remise, fk_product_fournisseur_price, buy_price_ht";
 			if ($date_start > 0) { $sql.= ",date_ouverture_prevue"; }
 			if ($date_end > 0)   { $sql.= ",date_fin_validite"; }
 			$sql.= ") VALUES ($this->id, '', '" . $this->db->escape($desc) . "',";
@@ -926,7 +940,11 @@ class Contrat extends CommonObject
 			$sql.= " ".price2num($remise_percent).",".price2num($pu_ht).",";
 			$sql.= " ".price2num($total_ht).",".price2num($total_tva).",".price2num($total_localtax1).",".price2num($total_localtax2).",".price2num($total_ttc).",";
 			$sql.= " '".$info_bits."',";
-			$sql.= " ".price2num($price).",".price2num($remise);	// TODO A virer
+			$sql.= " ".price2num($price).",".price2num($remise).",";
+			if (isset($fk_fournprice)) $sql.= ' '.$fk_fournprice.',';
+			else $sql.= ' null,';
+			if (isset($pa_ht)) $sql.= ' '.price2num($pa_ht);
+			else $sql.= ' null';
 			if ($date_start > 0) { $sql.= ",'".$this->db->idate($date_start)."'"; }
 			if ($date_end > 0) { $sql.= ",'".$this->db->idate($date_end)."'"; }
 			$sql.= ")";
@@ -983,7 +1001,7 @@ class Contrat extends CommonObject
 	 * 	@param  int			$info_bits			Bits de type de lignes
 	 *  @return int              				< 0 si erreur, > 0 si ok
 	 */
-	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $tvatx, $localtax1tx=0, $localtax2tx=0, $date_debut_reel='', $date_fin_reel='', $price_base_type='HT', $info_bits=0)
+	function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $tvatx, $localtax1tx=0, $localtax2tx=0, $date_debut_reel='', $date_fin_reel='', $price_base_type='HT', $info_bits=0, $fk_fournprice=null, $pa_ht = 0)
 	{
 		global $user, $conf, $langs;
 
@@ -995,6 +1013,7 @@ class Contrat extends CommonObject
 		$tvatx = price2num($tvatx);
 		$localtax1tx = price2num($localtax1tx);
 		$localtax2tx = price2num($localtax2tx);
+		$pa_ht=price2num($pa_ht);
 
 		$subprice = $price;
 		$remise = 0;
@@ -1016,7 +1035,7 @@ class Contrat extends CommonObject
 		// qty, pu, remise_percent et txtva
 		// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
 		// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
-		$tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $localtaxtx1, $txlocaltaxtx2, 0, $price_base_type, $info_bits, 1);
+		$tabprice=calcul_price_total($qty, $pu, $remise_percent, $tvatx, $localtaxtx1, $txlocaltaxtx2, 0, $price_base_type, $info_bits, 1);
 		$total_ht  = $tabprice[0];
 		$total_tva = $tabprice[1];
 		$total_ttc = $tabprice[2];
@@ -1032,6 +1051,14 @@ class Contrat extends CommonObject
 		    $price = $pu_ht - $remise;
 		}
 
+	    if (empty($pa_ht)) $pa_ht=0;
+
+		// si prix d'achat non renseigne et utilise pour calcul des marges alors prix achat = prix vente
+		if ($pa_ht == 0) {
+			if ($pu_ht > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1))
+				$pa_ht = $pu_ht * (1 - $remise_percent / 100);
+		}
+
 		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet set description='".$this->db->escape($desc)."'";
 		$sql.= ",price_ht='" .     price2num($price)."'";
 		$sql.= ",subprice='" .     price2num($subprice)."'";
@@ -1046,6 +1073,8 @@ class Contrat extends CommonObject
 		$sql.= ", total_localtax1='".price2num($total_localtax1)."'";
 		$sql.= ", total_localtax2='".price2num($total_localtax2)."'";
 		$sql.= ", total_ttc='".      price2num($total_ttc)."'";
+		$sql.= ", fk_product_fournisseur_price='".$fk_fournprice."'";
+		$sql.= ", buy_price_ht='".price2num($pa_ht)."'";
 		if ($date_start > 0) { $sql.= ",date_ouverture_prevue='".$this->db->idate($date_start)."'"; }
 		else { $sql.=",date_ouverture_prevue=null"; }
 		if ($date_end > 0) { $sql.= ",date_fin_validite='".$this->db->idate($date_end)."'"; }
@@ -1610,6 +1639,9 @@ class ContratLigne
 	var $total_localtax2;
 	var $total_ttc;
 
+	var $fk_fournprice;
+	var $pa_ht;
+
 	var $info_bits;
 	var $fk_user_author;
 	var $fk_user_ouverture;
@@ -1769,6 +1801,8 @@ class ContratLigne
 		$sql.= " t.total_localtax1,";
 		$sql.= " t.total_localtax2,";
 		$sql.= " t.total_ttc,";
+		$sql.= " t.fk_product_fournisseur_price as fk_fournprice,";
+		$sql.= " t.buy_price_ht as pa_ht,";
 		$sql.= " t.info_bits,";
 		$sql.= " t.fk_user_author,";
 		$sql.= " t.fk_user_ouverture,";
@@ -1819,6 +1853,9 @@ class ContratLigne
 				$this->fk_user_ouverture = $obj->fk_user_ouverture;
 				$this->fk_user_cloture = $obj->fk_user_cloture;
 				$this->commentaire = $obj->commentaire;
+				$this->fk_fournprice = $obj->fk_fournprice;
+				$marginInfos = getMarginInfos($obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, $this->fk_fournprice, $obj->pa_ht);
+				$this->pa_ht = $marginInfos[0];
 
 			}
 			$this->db->free($resql);
@@ -1887,6 +1924,14 @@ class ContratLigne
 		$this->total_localtax1= $tabprice[9];
 		$this->total_localtax2= $tabprice[10];
 
+	    if (empty($this->pa_ht)) $this->pa_ht=0;
+
+		// si prix d'achat non renseigné et utilisé pour calcul des marges alors prix achat = prix vente
+		if ($this->pa_ht == 0) {
+			if ($this->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1))
+				$this->pa_ht = $this->subprice * (1 - $this->remise_percent / 100);
+		}
+
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET";
 		$sql.= " fk_contrat='".$this->fk_contrat."',";
@@ -1913,6 +1958,8 @@ class ContratLigne
 		$sql.= " total_localtax1='".$this->total_localtax1."',";
 		$sql.= " total_localtax2='".$this->total_localtax2."',";
 		$sql.= " total_ttc='".$this->total_ttc."',";
+		$sql.= " fk_product_fournisseur_price='".$this->fk_fournprice."',";
+		$sql.= " buy_price_ht='".price2num($this->pa_ht)."',";
 		$sql.= " info_bits='".$this->info_bits."',";
 		$sql.= " fk_user_author=".($this->fk_user_author >= 0?$this->fk_user_author:"NULL").",";
 		$sql.= " fk_user_ouverture=".($this->fk_user_ouverture > 0?$this->fk_user_ouverture:"NULL").",";

From c6b263c586681541782f58f34a7c8c5189280649 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Wed, 13 Feb 2013 09:53:26 +0100
Subject: [PATCH 091/162] fix bug in contract update line (wrong vat variable
 name)

---
 htdocs/contrat/class/contrat.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 8cdd11fcb3c..224617c2f44 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1016,7 +1016,7 @@ class Contrat extends CommonObject
 		// qty, pu, remise_percent et txtva
 		// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
 		// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
-		$tabprice=calcul_price_total($qty, $pu, $remise_percent, $txtva, $localtaxtx1, $txlocaltaxtx2, 0, $price_base_type, $info_bits, 1);
+		$tabprice=calcul_price_total($qty, $pu, $remise_percent, $tvatx, $localtaxtx1, $txlocaltaxtx2, 0, $price_base_type, $info_bits, 1);
 		$total_ht  = $tabprice[0];
 		$total_tva = $tabprice[1];
 		$total_ttc = $tabprice[2];

From 4f33249c9efcc7c8423237783844e201fe6653d7 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Wed, 13 Feb 2013 10:35:47 +0100
Subject: [PATCH 092/162] margin management on contract card

---
 htdocs/contrat/fiche.php | 120 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 107 insertions(+), 13 deletions(-)

diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 9578bf54c98..7034f765d5f 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
  * Copyright (C) 2010-2012	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2013      Christophe Battarel   <christophe.battarel@altairis.fr>
  *
  * 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
@@ -305,6 +306,13 @@ else if ($action == 'addline' && $user->rights->contrat->creer)
         $localtax1_tx=get_localtax($tva_tx,1,$object->societe);
         $localtax2_tx=get_localtax($tva_tx,2,$object->societe);
 
+		// ajout prix achat
+		$fk_fournprice = $_POST['fournprice'];
+		if ( ! empty($_POST['buying_price']) )
+		  $pa_ht = $_POST['buying_price'];
+		else
+		  $pa_ht = null;
+
         $info_bits=0;
         if ($tva_npr) $info_bits |= 0x01;
 
@@ -329,7 +337,9 @@ else if ($action == 'addline' && $user->rights->contrat->creer)
                 $date_end,
                 $price_base_type,
                 $pu_ttc,
-                $info_bits
+                $info_bits,
+      			$fk_fournprice,
+      			$pa_ht
             );
         }
 
@@ -353,13 +363,18 @@ else if ($action == 'addline' && $user->rights->contrat->creer)
              }
              */
 
-        	unset($_POST['qty']);
-        	unset($_POST['type']);
-        	unset($_POST['idprod']);
-        	unset($_POST['remise_percent']);
-        	unset($_POST['price_ht']);
-        	unset($_POST['tva_tx']);
-        	unset($_POST['dp_desc']);
+			unset($_POST['qty']);
+			unset($_POST['type']);
+			unset($_POST['idprod']);
+			unset($_POST['remise_percent']);
+			unset($_POST['price_ht']);
+			unset($_POST['price_ttc']);
+			unset($_POST['tva_tx']);
+			unset($_POST['product_ref']);
+			unset($_POST['product_label']);
+			unset($_POST['product_desc']);
+			unset($_POST['fournprice']);
+			unset($_POST['buying_price']);
         }
         else
         {
@@ -389,6 +404,13 @@ else if ($action == 'updateligne' && $user->rights->contrat->creer && ! GETPOST(
 		$localtax1_tx=get_localtax(GETPOST('eltva_tx'),1,$object->thirdparty);
         $localtax2_tx=get_localtax(GETPOST('eltva_tx'),2,$object->thirdparty);
 
+	  	// ajout prix d'achat
+	  	$fk_fournprice = $_POST['fournprice'];
+	  	if ( ! empty($_POST['buying_price']) )
+	  	  $pa_ht = $_POST['buying_price'];
+	  	else
+	  	  $pa_ht = null;
+
         $objectline->description=GETPOST('product_desc');
         $objectline->price_ht=GETPOST('elprice');
         $objectline->subprice=GETPOST('elprice');
@@ -402,6 +424,8 @@ else if ($action == 'updateligne' && $user->rights->contrat->creer && ! GETPOST(
         $objectline->date_fin_validite=$date_end_update;
         $objectline->date_cloture=$date_end_real_update;
         $objectline->fk_user_cloture=$user->id;
+        $objectline->fk_fournprice=$fk_fournprice;
+        $objectline->pa_ht=$pa_ht;
 
         // TODO verifier price_min si fk_product et multiprix
 
@@ -872,7 +896,7 @@ else
             $sql.= " cd.tva_tx, cd.remise_percent, cd.info_bits, cd.subprice,";
             $sql.= " cd.date_ouverture_prevue as date_debut, cd.date_ouverture as date_debut_reelle,";
             $sql.= " cd.date_fin_validite as date_fin, cd.date_cloture as date_fin_reelle,";
-            $sql.= " cd.commentaire as comment,";
+            $sql.= " cd.commentaire as comment, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht,";
             $sql.= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype";
             $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
             $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
@@ -889,6 +913,8 @@ else
                 print '<td width="50" align="right">'.$langs->trans("PriceUHT").'</td>';
                 print '<td width="30" align="center">'.$langs->trans("Qty").'</td>';
                 print '<td width="50" align="right">'.$langs->trans("ReductionShort").'</td>';
+				if ($conf->margin->enabled)
+	                print '<td width="50" align="right">'.$langs->trans("BuyingPrice").'</td>';
                 print '<td width="30">&nbsp;</td>';
                 print "</tr>\n";
 
@@ -932,6 +958,10 @@ else
                     {
                         print '<td>&nbsp;</td>';
                     }
+
+					if ($conf->margin->enabled)
+						print '<td align="right" nowrap="nowrap">'.price($objp->pa_ht).'</td>';
+
                     // Icon move, update et delete (statut contrat 0=brouillon,1=valide,2=ferme)
                     print '<td align="right" nowrap="nowrap">';
                     if ($user->rights->contrat->creer && count($arrayothercontracts) && ($object->statut >= 0))
@@ -967,7 +997,7 @@ else
                     if ($objp->subprice >= 0)
                     {
                         print '<tr '.$bc[$var].'>';
-                        print '<td colspan="6">';
+                        print '<td colspan="'.($conf->margin->enabled?7:6).'">';
 
                         // Date planned
                         print $langs->trans("DateStartPlanned").': ';
@@ -998,6 +1028,8 @@ else
                     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
                     print '<input type="hidden" name="action" value="updateligne">';
                     print '<input type="hidden" name="elrowid" value="'.GETPOST('rowid').'">';
+                    print '<input type="hidden" name="idprod" value="'.($objp->fk_product?$objp->fk_product:'0').'">';
+                    print '<input type="hidden" name="fournprice" value="'.($objp->fk_fournprice?$objp->fk_fournprice:'0').'">';
                     // Ligne carac
                     print "<tr $bc[$var]>";
                     print '<td>';
@@ -1030,12 +1062,18 @@ else
                     print '<td align="right"><input size="5" type="text" name="elprice" value="'.price($objp->subprice).'"></td>';
                     print '<td align="center"><input size="2" type="text" name="elqty" value="'.$objp->qty.'"></td>';
                     print '<td align="right" nowrap="nowrap"><input size="1" type="text" name="elremise_percent" value="'.$objp->remise_percent.'">%</td>';
+					if ($conf->margin->enabled) {
+					    print '<td align="right">';
+					    if ($objp->fk_product)
+					        print '<select id="fournprice" name="fournprice"></select>';
+						print '<input id="buying_price" type="text" size="5" name="buying_price" value="'.price($objp->pa_ht,0,'',0).'"></td>';
+					}
                     print '<td align="center" rowspan="2" valign="middle"><input type="submit" class="button" name="save" value="'.$langs->trans("Modify").'">';
                     print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
                     print '</td>';
                     // Ligne dates prevues
                     print "<tr $bc[$var]>";
-                    print '<td colspan="5">';
+                    print '<td colspan="'.($conf->margin->enabled?6:5).'">';
                     print $langs->trans("DateStartPlanned").' ';
                     $form->select_date($db->jdate($objp->date_debut),"date_start_update",$usehm,$usehm,($db->jdate($objp->date_debut)>0?0:1),"update");
                     print '<br>'.$langs->trans("DateEndPlanned").' ';
@@ -1056,7 +1094,7 @@ else
             if ($object->statut > 0)
             {
                 print '<tr '.$bc[false].'>';
-                print '<td colspan="6"><hr></td>';
+                print '<td colspan="'.($conf->margin->enabled?7:6).'"><hr></td>';
                 print "</tr>\n";
             }
 
@@ -1213,7 +1251,7 @@ else
 
                 print '</tr>';
 
-                print '<tr '.$bc[$var].'><td>'.$langs->trans("Comment").'</td><td colspan="3"><input size="80" type="text" name="comment" value="'.GETPOST('comment').'"></td></tr>';
+                print '<tr '.$bc[$var].'><td>'.$langs->trans("Comment").'</td><td colspan="'.($conf->margin->enabled?4:3).'"><input size="80" type="text" name="comment" value="'.$_POST["comment"].'"></td></tr>';
 
                 print '</table>';
 
@@ -1395,3 +1433,59 @@ llxFooter();
 
 $db->close();
 ?>
+<?php
+if ($conf->margin->enabled) {
+?>
+<script type="text/javascript">
+<?php if ($action == 'editline') { ?>
+$(document).ready(function() {
+  var idprod = $("input[name='idprod']").val();
+  var fournprice = $("input[name='fournprice']").val();
+  if (idprod > 0) {
+	  $.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': idprod}, function(data) {
+	    if (data.length > 0) {
+	      var options = '';
+	      var trouve=false;
+	      $(data).each(function() {
+	        options += '<option value="'+this.id+'" price="'+this.price+'"';
+	        if (fournprice > 0) {
+		        if (this.id == fournprice) {
+		          options += ' selected';
+		          $("#buying_price").val(this.price);
+		          trouve = true;
+		        }
+	        }
+	        options += '>'+this.label+'</option>';
+	      });
+	      options += '<option value=null'+(trouve?'':' selected')+'><?php echo $langs->trans("InputPrice"); ?></option>';
+	      $("#fournprice").html(options);
+	      if (trouve) {
+	        $("#buying_price").hide();
+	        $("#fournprice").show();
+	      }
+	      else {
+	        $("#buying_price").show();
+	      }
+	      $("#fournprice").change(function() {
+	        var selval = $(this).find('option:selected').attr("price");
+	        if (selval)
+	          $("#buying_price").val(selval).hide();
+	        else
+	          $('#buying_price').show();
+	      });
+	    }
+	    else {
+	      $("#fournprice").hide();
+	      $('#buying_price').show();
+	    }
+	  },
+	  'json');
+	}
+    else {
+      $("#fournprice").hide();
+      $('#buying_price').show();
+    }
+});
+<?php } ?>
+</script>
+<?php } ?>

From caec1429b1889acd26f2c82a6366bee9b676e3c7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 Feb 2013 15:19:03 +0100
Subject: [PATCH 093/162] Fix: Uniformize database type according to page
 http://

---
 .../install/mysql/migration/2.0.0-2.1.0.sql   |  4 ++--
 .../install/mysql/migration/2.1.0-2.2.0.sql   | 24 +++++++++----------
 .../install/mysql/migration/3.3.0-3.4.0.sql   |  2 +-
 .../install/mysql/tables/llx_contratdet.sql   |  6 ++---
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/install/mysql/migration/2.0.0-2.1.0.sql b/htdocs/install/mysql/migration/2.0.0-2.1.0.sql
index 94572f0378e..e2205b29953 100644
--- a/htdocs/install/mysql/migration/2.0.0-2.1.0.sql
+++ b/htdocs/install/mysql/migration/2.0.0-2.1.0.sql
@@ -75,8 +75,8 @@ insert into llx_cond_reglement(rowid, code, sortorder, active, libelle, libelle_
 
 alter table llx_cond_reglement add (decalage smallint(6) default 0);
 
-alter table llx_commande add fk_cond_reglement int(11) DEFAULT NULL;
-alter table llx_commande add fk_mode_reglement int(11) DEFAULT NULL;
+alter table llx_commande add fk_cond_reglement integer DEFAULT NULL;
+alter table llx_commande add fk_mode_reglement integer DEFAULT NULL;
 
 
 alter table llx_categorie drop column fk_statut;
diff --git a/htdocs/install/mysql/migration/2.1.0-2.2.0.sql b/htdocs/install/mysql/migration/2.1.0-2.2.0.sql
index cfaa7ce105e..070682d3c50 100644
--- a/htdocs/install/mysql/migration/2.1.0-2.2.0.sql
+++ b/htdocs/install/mysql/migration/2.1.0-2.2.0.sql
@@ -143,8 +143,8 @@ alter table llx_categorie ADD type int not null default '0';
 -- V4 ALTER TABLE llx_categorie DROP INDEX uk_categorie_ref;
 
 create table `llx_categorie_societe` (
-  `fk_categorie` int(11) not null,
-  `fk_societe` int(11) not null,
+  `fk_categorie` integer not null,
+  `fk_societe` integer not null,
   UNIQUE KEY `fk_categorie` (`fk_categorie`,`fk_societe`),
   KEY `fk_societe` (`fk_societe`)
 ) ENGINE=innodb;
@@ -154,8 +154,8 @@ alter table `llx_categorie_societe` add constraint `fk_categorie_societe_categor
 alter table `llx_categorie_societe` add constraint `fk_categorie_societe_fk_soc` foreign key(`fk_societe`) REFERENCES `llx_societe` (`rowid`);
 
 create table `llx_categorie_product` (
-  `fk_categorie` int(11) not null,
-  `fk_product` int(11) not null,
+  `fk_categorie` integer not null,
+  `fk_product` integer not null,
   PRIMARY KEY  (`fk_categorie`,`fk_product`),
   KEY `idx_categorie_product_fk_categorie` (`fk_categorie`),
   KEY `idx_categorie_product_fk_product` (`fk_product`)
@@ -169,24 +169,24 @@ alter table `llx_categorie_product`
 -- Ajout gestion du droit de pret
 drop table if exists `llx_droitpret_rapport`;
 create table `llx_droitpret_rapport` (
-  `rowid` int(11) NOT NULL auto_increment,
+  `rowid` integer NOT NULL auto_increment,
   `date_envoie` datetime NOT NULL,
   `format` varchar(10) NOT NULL,
   `date_debut` datetime NOT NULL,
   `date_fin` datetime NOT NULL,
   `fichier` varchar(255) NOT NULL,
-  `nbfact` int(11) NOT NULL,
+  `nbfact` integer NOT NULL,
   PRIMARY KEY  (`rowid`)
 ) ENGINE=innodb;
 
 
 -- Gestion des menu
 CREATE TABLE `llx_menu` (
-  `rowid` int(11) NOT NULL,
+  `rowid` integer NOT NULL,
   `menu_handler` varchar(16) NOT NULL default 'auguria',
   `type` enum('top','left') NOT NULL default 'left',
   `mainmenu` varchar(100) NOT NULL,
-  `fk_menu` int(11) NOT NULL,
+  `fk_menu` integer NOT NULL,
   `order` tinyint(4) NOT NULL,
   `url` varchar(255) NOT NULL,
   `target` varchar(100) NULL,
@@ -200,15 +200,15 @@ CREATE TABLE `llx_menu` (
 ) ENGINE=innodb;
 
 create table `llx_menu_constraint` (
-  `rowid` int(11) NOT NULL,
+  `rowid` integer NOT NULL,
   `action` varchar(255) NOT NULL,
   PRIMARY KEY  (`rowid`)
 ) ENGINE=innodb;
 
 create table `llx_menu_const` (
-  `rowid` int(11) NOT NULL auto_increment,
-  `fk_menu` int(11) NOT NULL,
-  `fk_constraint` int(11) NOT NULL,
+  `rowid` integer NOT NULL auto_increment,
+  `fk_menu` integer NOT NULL,
+  `fk_constraint` integer NOT NULL,
   `user` tinyint(4) NOT NULL default '2',
   PRIMARY KEY  (`rowid`)
 ) ENGINE=innodb;
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 6f09732d0dc..093265e217c 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
@@ -34,5 +34,5 @@ UPDATE llx_const set value='smartphone_menu.php' where value='smartphone_frontof
 ALTER TABLE llx_user add COLUMN fk_user integer;
 
 -- margin on contracts
-alter table llx_contratdet add column fk_product_fournisseur_price int(11) after info_bits;
+alter table llx_contratdet add column fk_product_fournisseur_price integer after info_bits;
 alter table llx_contratdet add column buy_price_ht double(24,8) DEFAULT 0 after fk_product_fournisseur_price;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql
index 11381991015..ac4eea1de83 100644
--- a/htdocs/install/mysql/tables/llx_contratdet.sql
+++ b/htdocs/install/mysql/tables/llx_contratdet.sql
@@ -52,9 +52,9 @@ create table llx_contratdet
   total_localtax1       double(24,8)  DEFAULT 0,	   		   -- Total Local tax 1 de la ligne
   total_localtax2       double(24,8)  DEFAULT 0,	   		   -- Total Local tax 2 de la ligne
   total_ttc             double(24,8)  DEFAULT 0,	   		   -- Total TTC de la ligne toute quantite et incluant remise ligne et globale
-  info_bits		          integer       DEFAULT 0, 		       -- TVA NPR ou non
-  fk_product_fournisseur_price int(11) DEFAULT NULL,          -- supplier price id
-  buy_price_ht double(24,8) DEFAULT '0.00000000',             -- buying price
+  info_bits		               integer DEFAULT 0, 		       -- TVA NPR ou non
+  fk_product_fournisseur_price integer DEFAULT NULL,         -- supplier price id
+  buy_price_ht          double(24,8)  DEFAULT NULL,   -- buying price
 
   fk_user_author        integer       NOT NULL DEFAULT 0,
   fk_user_ouverture     integer,

From 1cfd32680aacd0c6a5e0215735046808e9a760ca Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <mko@atm-consulting.fr>
Date: Wed, 13 Feb 2013 15:43:27 +0100
Subject: [PATCH 094/162] Fix : set some vars when invoice is back to draft
 status

---
 htdocs/compta/facture/class/facture.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index b96fd57916d..8618c729592 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1829,6 +1829,8 @@ class Facture extends CommonInvoice
 
             if ($error == 0)
             {
+            	$this->brouillon = 1;
+            	$this->statut = 0;
                 $this->db->commit();
                 return 1;
             }

From 7d1c51ab779c0651c3a7422daf966472c920b886 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 Feb 2013 16:45:53 +0100
Subject: [PATCH 095/162] Add option MAIN_PDF_TITLE_BACKGROUND_COLOR

---
 ChangeLog                                                      | 1 +
 htdocs/core/modules/commande/doc/pdf_einstein.modules.php      | 3 +++
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php          | 3 +++
 htdocs/core/modules/propale/doc/pdf_azur.modules.php           | 3 +++
 .../core/modules/supplier_invoice/pdf/pdf_canelle.modules.php  | 3 +++
 .../core/modules/supplier_order/pdf/pdf_muscadet.modules.php   | 3 +++
 6 files changed, 16 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 8775d808037..294c09a6997 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ English Dolibarr ChangeLog
 For users:
 - New: Some performance enhancements.
 - New: Can attach files onto trip and expenses modules.
+- New: Add option MAIN_PDF_TITLE_BACKGROUND_COLOR
 
 For developers:
 - System of menu managers has been rewritten to reduce code to do same things. 
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index cff6d9b099f..8eed22b7249 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -972,6 +972,9 @@ class pdf_einstein extends ModelePDFCommandes
 			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+
+			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
+			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
 		}
 
 		$pdf->SetDrawColor(128,128,128);
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index bfa48ceed37..ca247b5ab99 100755
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1126,6 +1126,9 @@ class pdf_crabe extends ModelePDFFactures
 			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+
+			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
+			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
 		}
 
 		$pdf->SetDrawColor(128,128,128);
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 43f2bab3940..365bf46f586 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -1015,6 +1015,9 @@ class pdf_azur extends ModelePDFPropales
 			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+
+			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
+			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
 		}
 
 		$pdf->SetDrawColor(128,128,128);
diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
index 46b2e893996..38d244ddc38 100755
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -664,6 +664,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+
+			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
+			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
 		}
 
 		$pdf->SetDrawColor(128,128,128);
diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
index 6805bb3fddb..aacddd4f21f 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -843,6 +843,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+
+			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
+			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_droite-$this->marge_gauche, 5, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
 		}
 
 		$pdf->SetDrawColor(128,128,128);

From f869004b951450c20816dbee6627309edb36046e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 Feb 2013 16:46:28 +0100
Subject: [PATCH 096/162] Fix: Mass save or update of const fails.

---
 htdocs/admin/const.php       | 46 +++++++++++++++++++++++++++++-------
 htdocs/langs/en_US/main.lang |  1 +
 htdocs/langs/fr_FR/main.lang |  1 +
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 0d263991714..77534fd0d76 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -35,7 +35,7 @@ $rowid=GETPOST('rowid','int');
 $entity=GETPOST('entity','int');
 $action=GETPOST('action','alpha');
 $update=GETPOST('update','alpha');
-$delete=GETPOST('delete','alpha');
+$delete=GETPOST('delete');	// Do not use alpha here
 $debug=GETPOST('debug','int');
 $consts=GETPOST('const');
 $constname=GETPOST('constname','alpha');
@@ -47,6 +47,7 @@ $typeconst=array('yesno' => 'yesno', 'texte' => 'texte', 'chaine' => 'chaine');
 $mesg='';
 
 
+
 /*
  * Actions
  */
@@ -68,46 +69,70 @@ if ($action == 'add')
 
 	if (! $error)
 	{
-		if (dolibarr_set_const($db, $constname, $constvalue, $typeconst[$consttype], 1, $constnote, $entity) < 0)
+		if (dolibarr_set_const($db, $constname, $constvalue, $typeconst[$consttype], 1, $constnote, $entity) >= 0)
+		{
+			setEventMessage($langs->trans("RecordSaved"));
+		}
+		else
 		{
 			dol_print_error($db);
 		}
 	}
 }
 
-if (! empty($consts) && $update == $langs->trans("Modify"))
+// Mass update
+if (! empty($consts) && $action == 'update')
 {
+	$nbmodified=0;
 	foreach($consts as $const)
 	{
 		if (! empty($const["check"]))
 		{
-			if (dolibarr_set_const($db, $const["name"], $const["value"], $const["type"], 1, $const["note"], $const["entity"]) < 0)
+			if (dolibarr_set_const($db, $const["name"], $const["value"], $const["type"], 1, $const["note"], $const["entity"]) >= 0)
+			{
+				$nbmodified++;
+			}
+			else
 			{
 				dol_print_error($db);
 			}
 		}
 	}
+	if ($nbmodified > 0) setEventMessage($langs->trans("RecordSaved"));
+	$action='';
 }
 
-// Delete several lines at once
-if (! empty($consts) && $delete == $langs->trans("Delete"))
+// Mass delete
+if (! empty($consts) && $action == 'delete')
 {
+
+	$nbdeleted=0;
 	foreach($consts as $const)
 	{
 		if (! empty($const["check"]))	// Is checkbox checked
 		{
-			if (dolibarr_del_const($db, $const["rowid"], -1) < 0)
+			if (dolibarr_del_const($db, $const["rowid"], -1) >= 0)
+			{
+				$nbdeleted++;
+			}
+			else
 			{
 				dol_print_error($db);
 			}
 		}
 	}
+	if ($nbdeleted > 0) setEventMessage($langs->trans("RecordDeleted"));
+	$action='';
 }
 
 // Delete line from delete picto
 if ($action == 'delete')
 {
-	if (dolibarr_del_const($db, $rowid, $entity) < 0)
+	if (dolibarr_del_const($db, $rowid, $entity) >= 0)
+	{
+		setEventMessage($langs->trans("RecordDeleted"));
+	}
+	else
 	{
 		dol_print_error($db);
 	}
@@ -130,11 +155,13 @@ jQuery(document).ready(function() {
 	jQuery("#delconst").hide();
 	jQuery(".checkboxfordelete").click(function() {
 		jQuery("#delconst").show();
+		jQuery("#action").val('delete');
 	});
 	jQuery(".inputforupdate").keypress(function() {
 		var field_id = jQuery(this).attr("id");
 		var row_num = field_id.split("_");
 		jQuery("#updateconst").show();
+		jQuery("#action").val('update');
 		jQuery("#check_" + row_num[1]).attr("checked",true);
 	});
 });
@@ -195,7 +222,8 @@ print '</form>';
 print "\n";
 
 print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && $debug)?'?debug=1':'').'" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" id="action" name="action" value="">';
 
 // Show constants
 $sql = "SELECT";
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index bb10a493384..c24a0bd4ceb 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -59,6 +59,7 @@ NbOfEntries=Nb of entries
 GoToWikiHelpPage=Read online help (need Internet access)
 GoToHelpPage=Read help 
 RecordSaved=Record saved
+RecordDeleted=Record deleted
 LevelOfFeature=Level of features
 NotDefined=Not defined
 DefinedAndHasThisValue=Defined and value to
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 52c7b339ffe..ddac2178b58 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -59,6 +59,7 @@ NbOfEntries=Nb d'entrées
 GoToWikiHelpPage=Consulter l'aide (nécessite un accès internet)
 GoToHelpPage=Consulter l'aide
 RecordSaved=Enregistrement sauvegardé
+RecordDeleted=Enregistrement supprimé
 LevelOfFeature=Niveau de fonctionnalités
 NotDefined=Non défini
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr est configuré en mode authentification <b>%s</b> dans son fichier de configuration <b>conf.php</b>.<br>Cela signifie que la base des mots de passe est externe à Dolibarr, aussi toute modification de ce champ peut s'avérer sans effet.

From 031bc911ea5b2e25efc06c7f8f418379baf5a239 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 Feb 2013 16:46:28 +0100
Subject: [PATCH 097/162] Fix: Mass save or update of const fails.

---
 htdocs/admin/const.php       | 46 +++++++++++++++++++++++++++++-------
 htdocs/langs/en_US/main.lang |  1 +
 htdocs/langs/fr_FR/main.lang |  1 +
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 0d263991714..77534fd0d76 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -35,7 +35,7 @@ $rowid=GETPOST('rowid','int');
 $entity=GETPOST('entity','int');
 $action=GETPOST('action','alpha');
 $update=GETPOST('update','alpha');
-$delete=GETPOST('delete','alpha');
+$delete=GETPOST('delete');	// Do not use alpha here
 $debug=GETPOST('debug','int');
 $consts=GETPOST('const');
 $constname=GETPOST('constname','alpha');
@@ -47,6 +47,7 @@ $typeconst=array('yesno' => 'yesno', 'texte' => 'texte', 'chaine' => 'chaine');
 $mesg='';
 
 
+
 /*
  * Actions
  */
@@ -68,46 +69,70 @@ if ($action == 'add')
 
 	if (! $error)
 	{
-		if (dolibarr_set_const($db, $constname, $constvalue, $typeconst[$consttype], 1, $constnote, $entity) < 0)
+		if (dolibarr_set_const($db, $constname, $constvalue, $typeconst[$consttype], 1, $constnote, $entity) >= 0)
+		{
+			setEventMessage($langs->trans("RecordSaved"));
+		}
+		else
 		{
 			dol_print_error($db);
 		}
 	}
 }
 
-if (! empty($consts) && $update == $langs->trans("Modify"))
+// Mass update
+if (! empty($consts) && $action == 'update')
 {
+	$nbmodified=0;
 	foreach($consts as $const)
 	{
 		if (! empty($const["check"]))
 		{
-			if (dolibarr_set_const($db, $const["name"], $const["value"], $const["type"], 1, $const["note"], $const["entity"]) < 0)
+			if (dolibarr_set_const($db, $const["name"], $const["value"], $const["type"], 1, $const["note"], $const["entity"]) >= 0)
+			{
+				$nbmodified++;
+			}
+			else
 			{
 				dol_print_error($db);
 			}
 		}
 	}
+	if ($nbmodified > 0) setEventMessage($langs->trans("RecordSaved"));
+	$action='';
 }
 
-// Delete several lines at once
-if (! empty($consts) && $delete == $langs->trans("Delete"))
+// Mass delete
+if (! empty($consts) && $action == 'delete')
 {
+
+	$nbdeleted=0;
 	foreach($consts as $const)
 	{
 		if (! empty($const["check"]))	// Is checkbox checked
 		{
-			if (dolibarr_del_const($db, $const["rowid"], -1) < 0)
+			if (dolibarr_del_const($db, $const["rowid"], -1) >= 0)
+			{
+				$nbdeleted++;
+			}
+			else
 			{
 				dol_print_error($db);
 			}
 		}
 	}
+	if ($nbdeleted > 0) setEventMessage($langs->trans("RecordDeleted"));
+	$action='';
 }
 
 // Delete line from delete picto
 if ($action == 'delete')
 {
-	if (dolibarr_del_const($db, $rowid, $entity) < 0)
+	if (dolibarr_del_const($db, $rowid, $entity) >= 0)
+	{
+		setEventMessage($langs->trans("RecordDeleted"));
+	}
+	else
 	{
 		dol_print_error($db);
 	}
@@ -130,11 +155,13 @@ jQuery(document).ready(function() {
 	jQuery("#delconst").hide();
 	jQuery(".checkboxfordelete").click(function() {
 		jQuery("#delconst").show();
+		jQuery("#action").val('delete');
 	});
 	jQuery(".inputforupdate").keypress(function() {
 		var field_id = jQuery(this).attr("id");
 		var row_num = field_id.split("_");
 		jQuery("#updateconst").show();
+		jQuery("#action").val('update');
 		jQuery("#check_" + row_num[1]).attr("checked",true);
 	});
 });
@@ -195,7 +222,8 @@ print '</form>';
 print "\n";
 
 print '<form action="'.$_SERVER["PHP_SELF"].((empty($user->entity) && $debug)?'?debug=1':'').'" method="POST">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" id="action" name="action" value="">';
 
 // Show constants
 $sql = "SELECT";
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index dc2ee6b225e..98c28b231b2 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -58,6 +58,7 @@ NbOfEntries=Nb of entries
 GoToWikiHelpPage=Read online help (need Internet access)
 GoToHelpPage=Read help 
 RecordSaved=Record saved
+RecordDeleted=Record deleted
 LevelOfFeature=Level of features
 NotDefined=Not defined
 DefinedAndHasThisValue=Defined and value to
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index e402a8cd1fe..301b97c1e3a 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -58,6 +58,7 @@ NbOfEntries=Nb d'entrées
 GoToWikiHelpPage=Consulter l'aide (nécessite un accès internet)
 GoToHelpPage=Consulter l'aide
 RecordSaved=Enregistrement sauvegardé
+RecordDeleted=Enregistrement supprimé
 LevelOfFeature=Niveau de fonctionnalités
 NotDefined=Non défini
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr est configuré en mode authentification <b>%s</b> dans son fichier de configuration <b>conf.php</b>.<br>Cela signifie que la base des mots de passe est externe à Dolibarr, aussi toute modification de ce champ peut s'avérer sans effet.

From 365680d90eab9faee8d37b4bdc21e0ee2b0873a8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 13 Feb 2013 21:25:17 +0100
Subject: [PATCH 098/162] Fix: Missing vat rates

---
 htdocs/install/mysql/data/llx_c_tva.sql | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 8b840baf392..4e301564db8 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -67,6 +67,10 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (141, 14,   '7','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (142, 14,   '0','0','VAT Rate 0',1);
 
+-- CAMEROUN (id country=24)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (241, 24, '19.25','0','VAT standard rate',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (242, 24,     '0','0','VAT Rate 0',1);
+
 -- CHILE (id country=67)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (671, 67,  '19','0','VAT standard rate',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (672, 67,   '0','0','VAT Rate 0',1);
@@ -151,6 +155,10 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (17
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1662, 166,  '15','0','VAT standard rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1663, 166,   '0','0','VAT Rate 0', 1);
 
+-- NIGERIA (id country=169)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1692, 169,   '5','0','VAT standard rate', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1693, 169,   '0','0','VAT Rate 0', 1);
+
 -- NORWAY (id country=173)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1731, 173,  '25','0','VAT standard rate', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1732, 173,   '14','0','VAT reduced rate', 1);

From f043fcfaf7c99644c96ff5d84874dd24d5a8fb3e Mon Sep 17 00:00:00 2001
From: fhenry <florian.henry@open-concept.pro>
Date: Thu, 14 Feb 2013 13:55:05 +0100
Subject: [PATCH 099/162]  	Fix bug [ bug #709 ]

---
 htdocs/comm/action/listactions.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php
index f369b25ab3b..341d430f2ac 100644
--- a/htdocs/comm/action/listactions.php
+++ b/htdocs/comm/action/listactions.php
@@ -143,6 +143,7 @@ if ($socid) $param.="&socid=".$socid;
 if ($showbirthday) $param.="&showbirthday=1";
 if ($pid) $param.="&projectid=".$pid;
 if ($type) $param.="&type=".$type;
+if ($actioncode) $param.="&actioncode=".$actioncode;
 
 $sql = "SELECT s.nom as societe, s.rowid as socid, s.client,";
 $sql.= " a.id, a.datep as dp, a.datep2 as dp2,";

From 2af7fd858e387513f043f02abed6b897ba2cf0c3 Mon Sep 17 00:00:00 2001
From: fhenry <florian.henry@open-concept.pro>
Date: Thu, 14 Feb 2013 14:57:37 +0100
Subject: [PATCH 100/162] Task 714

---
 htdocs/admin/mailing.php | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 54203dd7ae1..ea5c9b7bbb4 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -105,6 +105,24 @@ print_fiche_titre($langs->trans("MailingSetup"),$linkback,'setup');
 
 dol_htmloutput_mesg($mesg);
 
+
+if (! empty($conf->use_javascript_ajax))
+{
+	print "\n".'<script type="text/javascript">';
+	print '$(document).ready(function () {
+            $("#generate_token").click(function() {
+            	$.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
+            		action: \'getrandompassword\',
+            		generic: true
+				},
+				function(token) {
+					$("#MAILING_EMAIL_UNSUBSCRIBE_KEY").val(token);
+				});
+            });
+    });';
+	print '</script>';
+}
+
 print '<br>';
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -155,7 +173,9 @@ print '</td></tr>';
 $var=!$var;
 print '<tr '.$bc[$var].'><td>';
 print $langs->trans("ActivateCheckReadKey").'</td><td>';
-print '<input size="32" type="text" name="MAILING_EMAIL_UNSUBSCRIBE_KEY" '.$readonly.' value="'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY.'">';
+print '<input size="32" type="text" name="MAILING_EMAIL_UNSUBSCRIBE_KEY" id="MAILING_EMAIL_UNSUBSCRIBE_KEY" '.$readonly.' value="'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY.'">';
+if (! empty($conf->use_javascript_ajax))
+	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
 print '</td></tr>';
 
 print '</table>';

From d41e754f43b69fbe6e0230cd759afe3d16855cfe Mon Sep 17 00:00:00 2001
From: fhenry <florian.henry@open-concept.pro>
Date: Thu, 14 Feb 2013 15:08:22 +0100
Subject: [PATCH 101/162] Fix bug on task 350

---
 htdocs/comm/prospect/list.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php
index 69aaab9e68e..f00b93f1966 100755
--- a/htdocs/comm/prospect/list.php
+++ b/htdocs/comm/prospect/list.php
@@ -24,6 +24,10 @@
  *	\brief      Page to list prospects
  */
 
+error_reporting(E_ALL);
+ini_set('display_errors', true);
+ini_set('html_errors', false);
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/prospect/class/prospect.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -389,6 +393,7 @@ if ($resql)
 		$prospectstatic->id=$obj->rowid;
 		$prospectstatic->nom=$obj->nom;
         $prospectstatic->status=$obj->status;
+        $prospectstatic->fk_prospectlevel=$obj->fk_prospectlevel;
 		print $prospectstatic->getNomUrl(1,'prospect');
         print '</td>';
         print "<td>".$obj->zip."&nbsp;</td>";
@@ -398,7 +403,7 @@ if ($resql)
 		print '<td align="center">'.dol_print_date($db->jdate($obj->datec)).'</td>';
 		// Level
 		print '<td align="center">';
-		print $prospectstatic->LibLevel($obj->fk_prospectlevel);
+		print $prospectstatic->getLibProspLevel();
 		print "</td>";
 		// Statut
 		print '<td align="center" nowrap="nowrap">';
@@ -419,7 +424,7 @@ if ($resql)
 		print '</td>';
 
         print '<td align="right">';
-		print $prospectstatic->getLibStatut(3);
+		print $prospectstatic->LibStatut($prospectstatic->status,3);
         print '</td>';
 
         $parameters=array('obj' => $obj);

From f65f0e3f11f658241fbca369ed198d5b6eaaad2b Mon Sep 17 00:00:00 2001
From: fhenry <florian.henry@open-concept.pro>
Date: Thu, 14 Feb 2013 15:27:48 +0100
Subject: [PATCH 102/162] Remove debug string in buf correction of task 350

---
 htdocs/comm/prospect/list.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php
index f00b93f1966..302c47e2d1e 100755
--- a/htdocs/comm/prospect/list.php
+++ b/htdocs/comm/prospect/list.php
@@ -24,10 +24,6 @@
  *	\brief      Page to list prospects
  */
 
-error_reporting(E_ALL);
-ini_set('display_errors', true);
-ini_set('html_errors', false);
-
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/prospect/class/prospect.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';

From ff214dd295c5105d11c3eebef7527255c5e02600 Mon Sep 17 00:00:00 2001
From: fhenry <florian.henry@open-concept.pro>
Date: Thu, 14 Feb 2013 16:25:43 +0100
Subject: [PATCH 103/162] Manage tabs (add/remove by external module) for mass
 emalings screen

---
 htdocs/core/lib/emailing.lib.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/core/lib/emailing.lib.php b/htdocs/core/lib/emailing.lib.php
index e3d1b790f6e..766886af2c0 100644
--- a/htdocs/core/lib/emailing.lib.php
+++ b/htdocs/core/lib/emailing.lib.php
@@ -31,6 +31,12 @@ function emailing_prepare_head($object)
 {
 	global $user, $langs, $conf;
 
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'mailling');
+	
 	$h = 0;
 	$head = array();
 
@@ -53,6 +59,8 @@ function emailing_prepare_head($object)
 	$head[$h][2] = 'info';
 	$h++;
 
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'mailling','remove');
+
 	return $head;
 }
 

From c02bd0871159f2fdf4ce1d0dc91de050c6e703a5 Mon Sep 17 00:00:00 2001
From: fhenry <florian.henry@open-concept.pro>
Date: Thu, 14 Feb 2013 16:35:54 +0100
Subject: [PATCH 104/162] Checkstyle

---
 htdocs/core/lib/emailing.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/emailing.lib.php b/htdocs/core/lib/emailing.lib.php
index 766886af2c0..e68a62a2768 100644
--- a/htdocs/core/lib/emailing.lib.php
+++ b/htdocs/core/lib/emailing.lib.php
@@ -35,7 +35,7 @@ function emailing_prepare_head($object)
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'mailling');
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'emailing');
 	
 	$h = 0;
 	$head = array();
@@ -59,7 +59,7 @@ function emailing_prepare_head($object)
 	$head[$h][2] = 'info';
 	$h++;
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'mailling','remove');
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'emailing','remove');
 
 	return $head;
 }

From 14f21bc9f1d11326f804d942734bf2fb9f85a941 Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@aternatik.fr>
Date: Thu, 14 Feb 2013 23:34:44 +0100
Subject: [PATCH 105/162] Add select list in extrafields type

---
 htdocs/core/admin_extrafields.inc.php         | 19 ++++-
 htdocs/core/class/extrafields.class.php       | 72 +++++++++++++++----
 htdocs/core/tpl/admin_extrafields_add.tpl.php | 35 ++++++---
 .../install/mysql/migration/3.3.0-3.4.0.sql   |  5 +-
 htdocs/langs/en_US/admin.lang                 |  1 +
 htdocs/langs/en_US/errors.lang                |  1 +
 htdocs/langs/fr_FR/admin.lang                 |  1 +
 htdocs/langs/fr_FR/errors.lang                |  1 +
 8 files changed, 113 insertions(+), 22 deletions(-)

diff --git a/htdocs/core/admin_extrafields.inc.php b/htdocs/core/admin_extrafields.inc.php
index 46ed7d0c051..29c71f9ba45 100644
--- a/htdocs/core/admin_extrafields.inc.php
+++ b/htdocs/core/admin_extrafields.inc.php
@@ -28,6 +28,7 @@ $extrasize=GETPOST('size');
 if (GETPOST('type')=='double' && strpos($extrasize,',')===false) $extrasize='24,8';
 if (GETPOST('type')=='date')     $extrasize='';
 if (GETPOST('type')=='datetime') $extrasize='';
+if (GETPOST('type')=='select')    $extrasize='';
 
 
 // Add attribute
@@ -58,13 +59,29 @@ if ($action == 'add')
             $mesg=$langs->trans("ErrorSizeTooLongForIntType",$maxsizeint);
             $action = 'create';
         }
+        if (GETPOST('type')=='select' && !GETPOST('extra_value'))
+        {
+        	$error++;
+        	$langs->load("errors");
+        	$mesg=$langs->trans("ErrorNoValueForSelectType");
+        	$action = 'create';
+        }
 
 	    if (! $error)
 	    {
     		// Type et taille non encore pris en compte => varchar(255)
     		if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$_POST['attrname']))
     		{
-                $result=$extrafields->addExtraField($_POST['attrname'],$_POST['label'],$_POST['type'],$_POST['pos'],$extrasize,$elementtype,(GETPOST('unique')?1:0),(GETPOST('required')?1:0));
+    			// Construct array for parameter (value of select list)
+    			$parameters = GETPOST('extra_value');
+    			$parameters_array = explode("\r\n",$parameters);
+    			foreach($parameters_array as $param_ligne)
+    			{
+    				list($key,$value) = explode(',',$param_ligne);
+    				$params['options'][$key] = $value;
+    			}  			 
+    			
+                $result=$extrafields->addExtraField($_POST['attrname'],$_POST['label'],$_POST['type'],$_POST['pos'],$extrasize,$elementtype,(GETPOST('unique')?1:0),(GETPOST('required')?1:0),$default_value,$params);
     			if ($result > 0)
     			{
     				header("Location: ".$_SERVER["PHP_SELF"]);
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 799200ca5bf..0fd57fed96d 100755
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -38,6 +38,8 @@ class ExtraFields
 	var $attribute_label;
 	// Tableau contenant le nom des champs en clef et la taille de ces champs en value
 	var $attribute_size;
+	// Tableau contenant le nom des choix en clef et la valeur de ces choix en value
+	var $attribute_choice;
 	// Array to store if attribute is unique or not
 	var $attribute_unique;
 	// Array to store if attribute is required or not
@@ -56,7 +58,8 @@ class ExtraFields
 		'boolean'=>'Boolean',
 		'price'=>'ExtrafieldPrice',
 		'phone'=>'ExtrafieldPhone',
-		'mail'=>'ExtrafieldMail'
+		'mail'=>'ExtrafieldMail',
+		'select' => 'ExtrafieldSelect'
 	);
 
 	/**
@@ -87,20 +90,22 @@ class ExtraFields
      *  @param  string	$elementtype        Element type ('member', 'product', 'company', ...)
      *  @param	int		$unique				Is field unique or not
      *  @param	int		$required			Is field required or not
+     *  @param  array	$param				Params for field 
      *  @return int      					<=0 if KO, >0 if OK
      */
-    function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0)
+    function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0,$default_value='', $param=0)
 	{
         if (empty($attrname)) return -1;
         if (empty($label)) return -1;
 
+        
         // Create field into database
-        $result=$this->create($attrname,$type,$size,$elementtype, $unique, $required);
+        $result=$this->create($attrname,$type,$size,$elementtype, $unique, $required, $default_value,$param);
         $err1=$this->errno;
         if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS')
         {
         	// Add declaration of field into table
-            $result2=$this->create_label($attrname,$label,$type,$pos,$size,$elementtype, $unique, $required);
+            $result2=$this->create_label($attrname,$label,$type,$pos,$size,$elementtype, $unique, $required, $param);
             $err2=$this->errno;
             if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS'))
             {
@@ -126,12 +131,15 @@ class ExtraFields
      *  @param  string	$elementtype        Element type ('member', 'product', 'company', 'contact', ...)
      *  @param	int		$unique				Is field unique or not
      *  @param	int		$required			Is field required or not
+     *  @param  string  $default_value		Default value for field
+     *  @param  array	$param				Params for field  (ex for select list : array('options'=>array('value'=>'label of option'))
+     *  
      *  @return int      	           		<=0 if KO, >0 if OK
 	 */
-	private function create($attrname, $type='varchar', $length=255, $elementtype='member', $unique=0, $required=0)
+	private function create($attrname, $type='varchar', $length=255, $elementtype='member', $unique=0, $required=0, $default_value='',$param='')
 	{
         $table=$elementtype.'_extrafields';
-
+        
         // Special case for not normalized table names
         if ($elementtype == 'member')  $table='adherent_extrafields';
         elseif ($elementtype == 'company') $table='societe_extrafields';
@@ -151,11 +159,20 @@ class ExtraFields
 			}elseif($type=='mail') {
 				$typedb='varchar';
 				$lengthdb='128';
+			} elseif ($type=='select') {
+				$typedb='text';
+				$lengthdb='';
 			} else {
 				$typedb=$type;
 				$lengthdb=$length;
 			}
-			$field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required?'NOT NULL':'NULL'));
+			$field_desc = array(
+				'type'=>$typedb, 
+				'value'=>$lengthdb, 
+				'null'=>($required?'NOT NULL':'NULL'),
+				'default' => $default_value
+			);
+			
 			$result=$this->db->DDLAddField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
 			if ($result > 0)
 			{
@@ -190,19 +207,33 @@ class ExtraFields
 	 *  @param  string	$elementtype        Element type ('member', 'product', 'company', ...)
      *  @param	int		$unique				Is field unique or not
      *  @param	int		$required			Is field required or not
+     *  @param  array	$param				Params for field  (ex for select list : array('value'=>'label of option') )  
 	 *  @return	int							<=0 if KO, >0 if OK
 	 */
-	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0)
+	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0,$param)
 	{
 		global $conf;
 
 		// Clean parameters
 		if (empty($pos)) $pos=0;
 
-
+		
 		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
 		{
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(name, label, type, pos, size, entity, elementtype, fieldunique, fieldrequired)";
+			if(is_array($param) and count($param) > 0)
+			{
+				$params = $this->db->escape(serialize($param));
+			}
+			elseif (strlen($param) > 0)
+			{
+				$params = trim($param);
+			}
+			else
+			{
+				$params='';
+			}
+			
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(name, label, type, pos, size, entity, elementtype, fieldunique, fieldrequired, param)";
 			$sql.= " VALUES('".$attrname."',";
 			$sql.= " '".$this->db->escape($label)."',";
 			$sql.= " '".$type."',";
@@ -211,7 +242,8 @@ class ExtraFields
 			$sql.= " ".$conf->entity.",";
             $sql.= " '".$elementtype."',";
             $sql.= " '".$unique."',";
-            $sql.= " '".$required."'";
+            $sql.= " '".$required."',";
+            $sql.= " '".$params."'";
             $sql.=')';
 
 			dol_syslog(get_class($this)."::create_label sql=".$sql);
@@ -480,7 +512,7 @@ class ExtraFields
 		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
 			return $array_name_label;
 
-		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired";
+		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param";
 		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
 		$sql.= " WHERE entity = ".$conf->entity;
 		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";
@@ -502,6 +534,7 @@ class ExtraFields
                     $this->attribute_elementtype[$tab->name]=$tab->elementtype;
                     $this->attribute_unique[$tab->name]=$tab->fieldunique;
                     $this->attribute_required[$tab->name]=$tab->fieldrequired;
+                    $this->attribute_param[$tab->name]=unserialize($tab->param);
 				}
 			}
 			return $array_name_label;
@@ -531,6 +564,7 @@ class ExtraFields
         $elementtype=$this->attribute_elementtype[$key];
         $unique=$this->attribute_unique[$key];
         $required=$this->attribute_required[$key];
+        $param=$this->attribute_param[$key];
         if ($type == 'date')
         {
             $showsize=10;
@@ -593,6 +627,15 @@ class ExtraFields
         {
         	$out='<input type="text" name="options_'.$key.'"  size="6" value="'.price($value).'"> '.$langs->getCurrencySymbol($conf->currency);
         }
+        elseif ($type == 'select')
+        {
+        	$out='<select name="options_'.$key.'">';
+        	foreach ($param['options'] as $key=>$value )
+        	{
+        		$out.='<option value="'.$key.'">'.$value.'</option>';
+        	}
+        	$out.='</select>';
+        }
         // Add comments
 	    if ($type == 'date') $out.=' (YYYY-MM-DD)';
         elseif ($type == 'datetime') $out.=' (YYYY-MM-DD HH:MM:SS)';
@@ -617,6 +660,7 @@ class ExtraFields
         $elementtype=$this->attribute_elementtype[$key];
         $unique=$this->attribute_unique[$key];
         $required=$this->attribute_required[$key];
+        $params=$this->attribute_param[$key];
         if ($type == 'date')
         {
             $showsize=10;
@@ -649,6 +693,10 @@ class ExtraFields
         {
         	$value=price($value).' '.$langs->getCurrencySymbol($conf->currency);
         }
+        elseif ($type == 'select')
+        {
+        	$value=$params['options'][$value];
+        }
         else
         {
             $showsize=round($size);
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 01190bf4405..0af2b782912 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -25,14 +25,22 @@
     		var size = jQuery("#size");
     		var unique = jQuery("#unique");
     		var required = jQuery("#required");
-    		if (type == 'date') { size.val('').attr('disabled','disabled'); unique.removeAttr('disabled','disabled'); }
-    		else if (type == 'datetime') { size.val('').attr('disabled','disabled'); unique.removeAttr('disabled','disabled'); }
-    		else if (type == 'double') { size.val('24,8').removeAttr('disabled'); unique.removeAttr('disabled','disabled'); }
-    		else if (type == 'int') { size.val('10').removeAttr('disabled'); unique.removeAttr('disabled','disabled'); }
-    		else if (type == 'text') { size.val('2000').removeAttr('disabled'); unique.attr('disabled','disabled').removeAttr('checked'); }
-    		else if (type == 'varchar') { size.val('255').removeAttr('disabled'); unique.removeAttr('disabled','disabled'); }
-    		else if (type == 'boolean') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');}
-    		else if (type == 'price') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');}
+    		<?php
+    		if(!GETPOST('type') == "select") 
+    		{
+    			print 'jQuery("#value_choice").hide();';
+    		}
+    		?>
+    		
+    		if (type == 'date') { size.val('').attr('disabled','disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide(); }
+    		else if (type == 'datetime') { size.val('').attr('disabled','disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide(); }
+    		else if (type == 'double') { size.val('24,8').removeAttr('disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide(); }
+    		else if (type == 'int') { size.val('10').removeAttr('disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide(); }
+    		else if (type == 'text') { size.val('2000').removeAttr('disabled'); unique.attr('disabled','disabled').removeAttr('checked'); jQuery("#value_choice").hide(); }
+    		else if (type == 'varchar') { size.val('255').removeAttr('disabled'); unique.removeAttr('disabled','disabled'); jQuery("#value_choice").hide(); }
+    		else if (type == 'boolean') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").hide();}
+    		else if (type == 'price') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").hide();}
+    		else if (type == 'select') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();}
     		else size.val('').attr('disabled','disabled');
     	}
     	init_typeoffields('');
@@ -56,6 +64,17 @@
 <tr><td class="fieldrequired"><?php echo $langs->trans("Type"); ?></td><td class="valeur">
 <?php print $form->selectarray('type',$type2label,GETPOST('type')); ?>
 </td></tr>
+<!--  Value (for select list / radio) -->
+<tr id="value_choice">
+<td>
+	<?php echo $langs->trans("Value"); ?>
+</td>
+<td>
+	<textarea name="extra_value" id="extra_value"><?php echo GETPOST('extra_value'); ?></textarea>
+</td>
+</tr>
+<!-- Default Value -->
+<tr><td><?php echo $langs->trans("DefaultValue"); ?></td><td class="valeur"><input id="default_value" type="text" name=""default_value"" size="5" value="<?php echo (GETPOST('"default_value"')?GETPOST('"default_value"'):''); ?>"></td></tr>
 <!-- Size -->
 <tr><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td class="valeur"><input id="size" type="text" name="size" size="5" value="<?php echo (GETPOST('size')?GETPOST('size'):''); ?>"></td></tr>
 <!-- Unique -->
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 093265e217c..1c17efb697c 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
@@ -35,4 +35,7 @@ ALTER TABLE llx_user add COLUMN fk_user integer;
 
 -- margin on contracts
 alter table llx_contratdet add column fk_product_fournisseur_price integer after info_bits;
-alter table llx_contratdet add column buy_price_ht double(24,8) DEFAULT 0 after fk_product_fournisseur_price;
\ No newline at end of file
+alter table llx_contratdet add column buy_price_ht double(24,8) DEFAULT 0 after fk_product_fournisseur_price;
+
+-- serialised array, to store value of select list choices for example
+alter table llx_extrafields add column param text DEFAULT '' after pos;
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 42924eb253f..090064ab0ec 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -356,6 +356,7 @@ Boolean=Boolean (Checkbox)
 ExtrafieldPhone = Phone
 ExtrafieldPrice = Price
 ExtrafieldMail = Email
+ExtrafieldSelect = Select list
 LibraryToBuildPDF=Library used to build PDF
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>   
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (vat is not applied on local tax)<br>2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)<br>3 : local tax apply on products without vat (vat is not applied on local tax)<br>4 : local tax apply on products before vat (vat is calculated on amount + localtax)<br>5 : local tax apply on services without vat (vat is not applied on local tax)<br>6 : local tax apply on services before vat (vat is calculated on amount + localtax)
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 2c5f634fff6..a4c5251bb69 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -58,6 +58,7 @@ ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin.
 ErrorFileSizeTooLarge=File size is too large.
 ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum)
 ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum)
+ErrorNoValueForSelectType=Please fill value for select list
 ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
 ErrorNoAccountancyModuleLoaded=No accountancy module activated
 ErrorExportDuplicateProfil=This profil name already exists for this export set.
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 802bbb28191..ee773c9ba46 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -351,6 +351,7 @@ Boolean=Booleen (Checkbox)
 ExtrafieldPhone = Téléphone
 ExtrafieldPrice = Prix
 ExtrafieldMail = Email
+ExtrafieldSelect = Liste de sélection
 LibraryToBuildPDF=Bibliothèque utilisée pour la génération des PDF
 WarningUsingFPDF=Attention: Votre fichier <b>conf.php</b> contient la directive <b>dolibarr_pdf_force_fpdf=1</b>. Cela signifie que vous utilisez la librairie FPDF pour générer vos fichiers PDF. Cette librairie est ancienne et ne couvre pas de nombreuses fonctionnalitée (Unicode, transparence des images, langues cyrillic, arabes ou asiatiques...), aussi vous pouvez rencontrez des problèmes durant la génération des PDF.<br>Pour résoudre cela et avoir un support complet de PDF, vous pouvez télécharger la <a href="http://www.tcpdf.org/" target="_blank">librairie TCPDF</a> puis commenter ou supprimer la ligne <b>$dolibarr_pdf_force_fpdf=1</b>, et ajouter à la place <b>$dolibarr_lib_TCPDF_PATH='chemin_vers_TCPDF'</b>   
 LocalTaxDesc=Certains pays appliquent 2 voir 3 taux sur chaque ligne de facture. Si c'est le cas, choisissez le type du deuxième et troisième taux et sa valeur. Les types possibles sont:<br>1 : taxe locale sur les produits et services hors tva (la tva n'est pas appliquée sur la taxe locale)<br>2 : taxe locale sur les produits et services avant tva (la tva est appliquée sur le montant + la taxe locale)<br>3 : taxe locale uniquement sur les produits hors tva (la tva n'est pas appliquée sur la taxe locale)<br>4 : taxe locale uniquement sur les produits avant tva (la tva est appliquée sur le montant + la taxe locale)<br>5 : taxe locale uniquement sur les services hors tva (la tva n'est pas appliquée sur la taxe locale)<br>6 : taxe locale uniquement sur les service avant tva (la tva est appliquée sur le montant + la taxe locale)
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 99112a0db96..3c7d1e275ed 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -59,6 +59,7 @@ ErrorUploadBlockedByAddon=Upload bloqué par un plugin PHP/Apache.
 ErrorFileSizeTooLarge=La taille du fichier est trop grande.
 ErrorSizeTooLongForIntType=Longueur de champ trop longue pour le type int (%s chiffres maximum)
 ErrorSizeTooLongForVarcharType=Longueur de champ trop longue pour le type chaine (%s caractères maximum)
+ErrorNoValueForSelectType=Les valeurs de la liste doivent être renseignées
 ErrorFieldCanNotContainSpecialCharacters=Le champ <b>%s</b> ne peut contenir de caractères spéciaux.
 ErrorNoAccountancyModuleLoaded=Aucun module de comptabilité activé
 ErrorExportDuplicateProfil=Ce nom de profil existe déjà pour ce lot d'export.

From f847558363296ddf41bfe5a16149545973a27f4e Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Fri, 15 Feb 2013 07:21:10 +0100
Subject: [PATCH 106/162] Update htdocs/product/class/product.class.php

fetch_prod_arbo / recursive call of the child product test
---
 htdocs/product/class/product.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 8724671c20d..fc0c08e736f 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2185,10 +2185,10 @@ class Product extends CommonObject
 				$this->res[]= array($compl_path.$nom_pere,$desc_pere);
 			}
 
-			// Recursive call
-			if (is_array($desc_pere)>2)
+			// Recursive call if child is an array
+			if (is_array($desc_pere[0]))
 			{
-				$this ->fetch_prod_arbo($desc_pere, $nom_pere." -> ", $desc_pere[1]*$multiply, $level+1);
+				$this ->fetch_prod_arbo($desc_pere[0], $nom_pere." -> ", $desc_pere[1]*$multiply, $level+1);
 			}
 		}
 	}

From bbb18b317568b0ea21fb3b56cf572a07bc34147b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Feb 2013 10:42:35 +0100
Subject: [PATCH 107/162] Look: More CSS3

---
 htdocs/comm/action/index.php    | 19 +++++++++++++++----
 htdocs/theme/eldy/style.css.php | 11 +++++++++--
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index dc48f407c03..cbf8ef0840e 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -941,7 +941,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
     print '<div id="dayevent_'.sprintf("%04d",$year).sprintf("%02d",$month).sprintf("%02d",$day).'" class="dayevent">'."\n";
     $curtime = dol_mktime(0, 0, 0, $month, $day, $year);
     print '<table class="nobordernopadding" width="100%">';
-    print '<tr style="background: #EEEEEE"><td align="left" nowrap="nowrap">';
+    print '<tr><td align="left" nowrap="nowrap">';
     print '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?';
     print 'action=show_day&day='.str_pad($day, 2, "0", STR_PAD_LEFT).'&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year;
     print $newparam;
@@ -960,7 +960,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
         print '</a>';
     }
     print '</td></tr>';
-    print '<tr height="'.$minheight.'"><td valign="top" colspan="2" nowrap="nowrap">';
+    print '<tr height="'.$minheight.'"><td valign="top" colspan="2" nowrap="nowrap" style="padding-bottom: 2px;">';
 
     //$curtime = dol_mktime (0, 0, 0, $month, $day, $year);
     $i=0; $nummytasks=0; $numother=0; $numbirthday=0; $numical=0; $numicals=array();
@@ -1004,8 +1004,9 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 
                     // Show rect of event
                     print '<div id="event_'.$ymd.'_'.$i.'" class="event '.$cssclass.'">';
-                    print '<table class="cal_event" style="background: #'.$color.'; -moz-border-radius:4px;" width="100%"><tr>';
-                    print '<td nowrap="nowrap">';
+                    print '<ul class="cal_event"><li class="cal_event">';
+                    print '<table class="cal_event" style="background: #'.$color.'; -moz-border-radius:4px; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,2).')); " width="100%"><tr>';
+                    print '<td nowrap="nowrap" class="cal_event">';
                     if ($event->type_code == 'BIRTHDAY') // It's a birthday
                     {
                         print $event->getNomUrl(1,$maxnbofchar,'cal_event','birthday','contact');
@@ -1130,6 +1131,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     if ($event->type_code != 'BIRTHDAY' && $event->type_code != 'ICALEVENT') print $event->getLibStatut(3,1);
                     else print '&nbsp;';
                     print '</td></tr></table>';
+                    print '</li></ul>';
                     print '</div>';
                     $i++;
                 }
@@ -1174,4 +1176,13 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
     print '</div>'."\n";
 }
 
+function dol_color_minus($color, $minus)
+{
+	$newcolor=$color;
+	$newcolor[0]=((hexdec($newcolor[0])-$minus)<0)?0:dechex((hexdec($newcolor[0])-$minus));
+	$newcolor[2]=((hexdec($newcolor[2])-$minus)<0)?0:dechex((hexdec($newcolor[2])-$minus));
+	$newcolor[4]=((hexdec($newcolor[4])-$minus)<0)?0:dechex((hexdec($newcolor[4])-$minus));
+	return $newcolor;
+}
+
 ?>
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 0225c9d6cb8..ce27fdc40f1 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2059,8 +2059,15 @@ td.hidden {
 .cal_current_month { background: #FFFFFF; border: solid 1px #C0C0C0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_today         { background: #FFFFFF; border: solid 2px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_past          { }
-table.cal_event    { border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px; }
-table.cal_event td { border: 0px; padding-<?php print $left; ?>: 0px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
+table.cal_event    { border: none; border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px;
+						-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.25);
+						moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.25);
+						box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.25);
+						background: -webkit-gradient(linear, left top, left bottom, from(#006aac), to(#00438d));
+						}
+table.cal_event td { border: none; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
+ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; -webkit-padding-start: 2px !important; }
+li.cal_event       { border: none; list-style-type: none; }
 .cal_event a:link    { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:active  { color: #111111; font-size: 11px; font-weight: normal !important; }

From 7b9fc49deaaa81b492bf8543f34c09d4a7ccd1f9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Feb 2013 10:46:50 +0100
Subject: [PATCH 108/162] More CSS3

---
 htdocs/theme/amarok/style.css.php | 5 ++++-
 htdocs/theme/eldy/style.css.php   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index 115a63d7e66..71a1c47b375 100755
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -1168,7 +1168,7 @@ div.error {
 
 .product_line_stock_ok { color: #002200; }
 .product_line_stock_too_low { color: #664400; }
- 
+
 .fieldrequired {
 	font-weight:bold;
 	color:#333333;
@@ -1469,6 +1469,9 @@ table.cal_event {
 	margin-bottom:1px;
 }
 
+ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; -webkit-padding-start: 2px !important; }
+li.cal_event       { border: none; list-style-type: none; }
+
 .cal_event a:link {
 	color:#232323;
 	font-size:11px;
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index ce27fdc40f1..6e51e2d257e 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2071,7 +2071,7 @@ li.cal_event       { border: none; list-style-type: none; }
 .cal_event a:link    { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:active  { color: #111111; font-size: 11px; font-weight: normal !important; }
-.cal_event a:hover   { color: #111111; font-size: 11px; font-weight: normal !important; }
+.cal_event a:hover   { color: #111111; font-size: 11px; font-weight: normal !important; color:rgba(255,255,255,.75); }
 
 
 /* ============================================================================== */

From 3d8197ce4be0d36ee7de7a5dc11fe9c7ac0db1cf Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@aternatik.fr>
Date: Fri, 15 Feb 2013 11:19:49 +0100
Subject: [PATCH 109/162] Work on extrafields : position management & new type
 : select list

---
 htdocs/core/admin_extrafields.inc.php         | 15 +++++--
 htdocs/core/class/extrafields.class.php       | 33 +++++++++++----
 htdocs/core/tpl/admin_extrafields_add.tpl.php |  5 ++-
 .../core/tpl/admin_extrafields_edit.tpl.php   | 42 ++++++++++++++++---
 htdocs/societe/admin/societe_extrafields.php  |  2 +
 5 files changed, 79 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/admin_extrafields.inc.php b/htdocs/core/admin_extrafields.inc.php
index 29c71f9ba45..975fa94d308 100644
--- a/htdocs/core/admin_extrafields.inc.php
+++ b/htdocs/core/admin_extrafields.inc.php
@@ -59,7 +59,7 @@ if ($action == 'add')
             $mesg=$langs->trans("ErrorSizeTooLongForIntType",$maxsizeint);
             $action = 'create';
         }
-        if (GETPOST('type')=='select' && !GETPOST('extra_value'))
+        if (GETPOST('type')=='select' && !GETPOST('param'))
         {
         	$error++;
         	$langs->load("errors");
@@ -73,7 +73,7 @@ if ($action == 'add')
     		if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$_POST['attrname']))
     		{
     			// Construct array for parameter (value of select list)
-    			$parameters = GETPOST('extra_value');
+    			$parameters = GETPOST('param');
     			$parameters_array = explode("\r\n",$parameters);
     			foreach($parameters_array as $param_ligne)
     			{
@@ -136,7 +136,16 @@ if ($action == 'update')
 	    {
             if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$_POST['attrname']))
     		{
-    			$result=$extrafields->update($_POST['attrname'],$_POST['label'],$_POST['type'],$extrasize,$elementtype,(GETPOST('unique')?1:0),(GETPOST('required')?1:0));
+    			$pos = GETPOST('pos','int');
+    			// Construct array for parameter (value of select list)
+    			$parameters = GETPOST('param');
+    			$parameters_array = explode("\r\n",$parameters);
+    			foreach($parameters_array as $param_ligne)
+    			{
+    				list($key,$value) = explode(',',$param_ligne);
+    				$params['options'][$key] = $value;
+    			}
+    			$result=$extrafields->update($_POST['attrname'],$_POST['label'],$_POST['type'],$extrasize,$elementtype,(GETPOST('unique')?1:0),(GETPOST('required')?1:0),$pos,$params);
     			if ($result > 0)
     			{
     				header("Location: ".$_SERVER["PHP_SELF"]);
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 0fd57fed96d..4f583a667f9 100755
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -207,7 +207,7 @@ class ExtraFields
 	 *  @param  string	$elementtype        Element type ('member', 'product', 'company', ...)
      *  @param	int		$unique				Is field unique or not
      *  @param	int		$required			Is field required or not
-     *  @param  array	$param				Params for field  (ex for select list : array('value'=>'label of option') )  
+     *  @param  array	$param				Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
 	 *  @return	int							<=0 if KO, >0 if OK
 	 */
 	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0,$param)
@@ -343,9 +343,11 @@ class ExtraFields
      *  @param  string	$elementtype        Element type ('member', 'product', 'company', 'contact', ...)
      *  @param	int		$unique				Is field unique or not
      *  @param	int		$required			Is field required or not
+     *  @param	int		$pos				Position of attribute
+     *  @param  array	$param				Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
 	 * 	@return	int							>0 if OK, <=0 if KO
 	 */
-	function update($attrname,$label,$type,$length,$elementtype,$unique=0,$required=0)
+	function update($attrname,$label,$type,$length,$elementtype,$unique=0,$required=0,$pos,$param='')
 	{
         $table=$elementtype.'_extrafields';
 
@@ -368,6 +370,9 @@ class ExtraFields
 			}elseif($type=='mail') {
 				$typedb='varchar';
 				$lengthdb='128';
+			} elseif ($type=='select') {
+				$typedb='text';
+				$lengthdb='';
 			} else {
 				$typedb=$type;
 				$lengthdb=$length;
@@ -378,7 +383,7 @@ class ExtraFields
 			{
 				if ($label)
 				{
-					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required);
+					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param);
 				}
 				if ($result > 0)
 				{
@@ -424,9 +429,11 @@ class ExtraFields
      *  @param  string	$elementtype		Element type ('member', 'product', 'company', ...)
      *  @param	int		$unique				Is field unique or not
      *  @param	int		$required			Is field required or not
+     *  @param	int		$pos				Position of attribute
+     *  @param  array	$param				Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
      *  @return	int							<=0 if KO, >0 if OK
      */
-	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0)
+	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='')
 	{
 		global $conf;
 		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required);
@@ -434,7 +441,12 @@ class ExtraFields
 		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
 		{
 			$this->db->begin();
-
+			
+			if(is_array($param) && count($param) > 0)
+			{
+				$param = serialize($param);
+			}
+				
 			$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
 			$sql_del.= " WHERE name = '".$attrname."'";
 			$sql_del.= " AND entity = ".$conf->entity;
@@ -450,7 +462,9 @@ class ExtraFields
 			$sql.= " size,";
 			$sql.= " elementtype,";
 			$sql.= " fieldunique,";
-			$sql.= " fieldrequired";
+			$sql.= " fieldrequired,";
+			$sql.= " pos,";
+			$sql.= " param";
 			$sql.= ") VALUES (";
 			$sql.= "'".$attrname."',";
 			$sql.= " ".$conf->entity.",";
@@ -459,7 +473,9 @@ class ExtraFields
 			$sql.= " '".$size."',";
             $sql.= " '".$elementtype."',";
             $sql.= " '".$unique."',";
-            $sql.= " '".$required."'";
+            $sql.= " '".$required."',";
+            $sql.= " '".$pos."',";
+            $sql.= " '".$param."'";
             $sql.= ")";
 			dol_syslog(get_class($this)."::update_label sql=".$sql);
 			$resql2=$this->db->query($sql);
@@ -512,7 +528,7 @@ class ExtraFields
 		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))
 			return $array_name_label;
 
-		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param";
+		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos";
 		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
 		$sql.= " WHERE entity = ".$conf->entity;
 		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";
@@ -535,6 +551,7 @@ class ExtraFields
                     $this->attribute_unique[$tab->name]=$tab->fieldunique;
                     $this->attribute_required[$tab->name]=$tab->fieldrequired;
                     $this->attribute_param[$tab->name]=unserialize($tab->param);
+                    $this->attribute_pos[$tab->name]=$tab->pos;
 				}
 			}
 			return $array_name_label;
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 0af2b782912..d4f5cf9ae40 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -55,7 +55,8 @@
 <input type="hidden" name="action" value="add">
 
 <table summary="listofattributes" class="border centpercent">
-
+<!-- Position -->
+<tr><td class="fieldrequired"><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php echo GETPOST('pos'); ?>"></td></tr>
 <!-- Label -->
 <tr><td class="fieldrequired"><?php echo $langs->trans("Label"); ?></td><td class="valeur"><input type="text" name="label" size="40" value="<?php echo GETPOST('label'); ?>"></td></tr>
 <!-- Code -->
@@ -70,7 +71,7 @@
 	<?php echo $langs->trans("Value"); ?>
 </td>
 <td>
-	<textarea name="extra_value" id="extra_value"><?php echo GETPOST('extra_value'); ?></textarea>
+	<textarea name="param" id="param"><?php echo GETPOST('param'); ?></textarea>
 </td>
 </tr>
 <!-- Default Value -->
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 8eed3b96c37..c2112b636f2 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -47,21 +47,53 @@
 
 <table summary="listofattributes" class="border centpercent">
 
-<!-- Label -->
-<tr><td class="fieldrequired"><?php echo $langs->trans("Label"); ?></td><td class="valeur"><input type="text" name="label" size="40" value="<?php echo $extrafields->attribute_label[$attrname]; ?>"></td></tr>
-<!-- Code -->
-<tr><td class="fieldrequired"><?php echo $langs->trans("AttributeCode"); ?></td><td class="valeur"><?php echo $attrname; ?></td></tr>
-<!-- Type -->
 <?php
 $type=$extrafields->attribute_type[$attrname];
 $size=$extrafields->attribute_size[$attrname];
 $unique=$extrafields->attribute_unique[$attrname];
 $required=$extrafields->attribute_required[$attrname];
+$pos=$extrafields->attribute_pos[$attrname];
+$param=$extrafields->attribute_param[$attrname];
+
+if($type == 'select' && is_array($param))
+{
+	$param_chain = '';
+	foreach ($param['options'] as $key => $value)
+	{
+		if(strlen($key)) 
+		{
+			$param_chain .= $key.', '.$value."\n";
+		}
+	}
+}
 ?>
+<!-- Position -->
+<tr><td class="fieldrequired"><?php echo $langs->trans("Position"); ?></td><td class="valeur"><input type="text" name="pos" size="5" value="<?php  echo $extrafields->attribute_pos[$attrname];  ?>"></td></tr>
+<!-- Label -->
+<tr><td class="fieldrequired"><?php echo $langs->trans("Label"); ?></td><td class="valeur"><input type="text" name="label" size="40" value="<?php echo $extrafields->attribute_label[$attrname]; ?>"></td></tr>
+<!-- Code -->
+<tr><td class="fieldrequired"><?php echo $langs->trans("AttributeCode"); ?></td><td class="valeur"><?php echo $attrname; ?></td></tr>
+<!-- Type -->
 <tr><td class="fieldrequired"><?php echo $langs->trans("Type"); ?></td><td class="valeur">
 <?php print $type2label[$type]; ?>
 <input type="hidden" name="type" id="type" value="<?php print $type; ?>">
 </td></tr>
+<!--  Value (for select list / radio) -->
+<?php 
+if($type == 'select') 
+{
+?>
+<tr id="value_choice">
+<td>
+	<?php echo $langs->trans("Value"); ?>
+</td>
+<td>
+	<textarea name="param" id="param"><?php echo $param_chain; ?></textarea>
+</td>
+</tr>
+<?php 
+}
+?>
 <!-- Size -->
 <tr><td class="fieldrequired"><?php echo $langs->trans("Size"); ?></td><td><input id="size" type="text" name="size" size="5" value="<?php echo $size; ?>"></td></tr>
 <!-- Unique -->
diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php
index cbac832ee3b..66957c0314a 100755
--- a/htdocs/societe/admin/societe_extrafields.php
+++ b/htdocs/societe/admin/societe_extrafields.php
@@ -84,6 +84,7 @@ $extrafields->fetch_name_optionals_label($elementtype);
 print "<table summary=\"listofattributes\" class=\"noborder\" width=\"100%\">";
 
 print '<tr class="liste_titre">';
+print '<td align="center">'.$langs->trans("Position").'</td>';
 print '<td>'.$langs->trans("Label").'</td>';
 print '<td>'.$langs->trans("AttributeCode").'</td>';
 print '<td>'.$langs->trans("Type").'</td>';
@@ -98,6 +99,7 @@ foreach($extrafields->attribute_type as $key => $value)
 {
     $var=!$var;
     print "<tr ".$bc[$var].">";
+    print "<td>".$extrafields->attribute_pos[$key]."</td>\n";
     print "<td>".$extrafields->attribute_label[$key]."</td>\n";
     print "<td>".$key."</td>\n";
     print "<td>".$type2label[$extrafields->attribute_type[$key]]."</td>\n";

From cddd59d98dfbe2f51c702445cb06c096a385b093 Mon Sep 17 00:00:00 2001
From: Grand Philippe <contact@atoo-net.com>
Date: Fri, 15 Feb 2013 14:23:35 +0100
Subject: [PATCH 110/162] fix : doesnt work with a \/

---
 htdocs/langs/fr_FR/admin.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 802bbb28191..d5c0daa97b8 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -283,7 +283,7 @@ GenericMaskCodes3= Tout autre caractère dans le masque sera laissé inchangé.<
 GenericMaskCodes4a= <u>Exemple sur la 99eme %s du tiers LaCompanie faite le 31/03/2007:</u><br>
 GenericMaskCodes4b= <u>Exemple sur un tiers créé le 31/03/2007:</u><br>
 GenericMaskCodes4c= <u>Exemple sur un produit/service créé le 31/03/2007:</u><br>
-GenericMaskCodes5= <b>ABC{yy}{mm}-{000000}</b> donnera <b>ABC0703-000099</b><br><b>{0000+100}-XXX/{dd}/YYY</b> donnera <b>0199-XXX/31/YYY</b>
+GenericMaskCodes5= <b>ABC{yy}{mm}-{000000}</b> donnera <b>ABC0703-000099</b><br><b>{0000+100}-XXX-{dd}-YYY</b> donnera <b>0199-XXX-31-YYY</b>
 GenericNumRefModelDesc= Renvoie un numéro personnalisable selon un masque à définir.
 ServerAvailableOnIPOrPort= Serveur disponible à l'adresse <b>%s</b> sur le port <b>%s</b>
 ServerNotAvailableOnIPOrPort= Serveur non disponible à l'adresse <b>%s</b> sur le port <b>%s</b>

From 7c1a4e6fdf49d4516adbfc338a6eaf8948843374 Mon Sep 17 00:00:00 2001
From: Grand Philippe <contact@atoo-net.com>
Date: Fri, 15 Feb 2013 15:48:53 +0100
Subject: [PATCH 111/162] fix trad to get better understanding

---
 htdocs/core/class/commonobject.class.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 5c9b8d93122..5d6d869ad81 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -1023,7 +1023,7 @@ abstract class CommonObject
 
     /**
      *  Save a new position (field rang) for details lines.
-     *  You can choose to ser position for lines with already a position or lines wihtout any position defined.
+     *  You can choose to set position for lines with already a position or lines without any position defined.
      *  Call this function only for table that contains a field fk_parent_line.
      *
      * 	@param		boolean		$renum			true to renum all already ordered lines, false to renum only not already ordered lines.
@@ -1064,7 +1064,7 @@ abstract class CommonObject
 			// counter that parents.
 			$rows=array();
 
-			// We frist search all lines that are parent lines (for multilevel details lines)
+			// We first search all lines that are parent lines (for multilevel details lines)
 			$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 			$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
 			$sql.= ' AND fk_parent_line IS NULL';
@@ -1080,10 +1080,10 @@ abstract class CommonObject
 				{
 					$row = $this->db->fetch_row($resql);
 					$rows[] = $row[0];	// Add parent line into array rows
-					$childrens = $this->getChildrensOfLine($row[0]);
-					if (! empty($childrens))
+					$childrens = $this->getChildrenOfLine($row[0]);
+					if (! empty($children))
 					{
-						foreach($childrens as $child)
+						foreach($children as $child)
 						{
 							array_push($rows, $child);
 						}
@@ -1108,12 +1108,12 @@ abstract class CommonObject
 	}
 
 	/**
-	 * 	Get childrens of line
+	 * 	Get children of line
 	 *
 	 * 	@param	int		$id		Id of parent line
-	 * 	@return	array			Array with list of child lines id
+	 * 	@return	array			Array with list of children lines id
 	 */
-	function getChildrensOfLine($id)
+	function getChildrenOfLine($id)
 	{
 		$rows=array();
 
@@ -1122,7 +1122,7 @@ abstract class CommonObject
 		$sql.= ' AND fk_parent_line = '.$id;
 		$sql.= ' ORDER BY rang ASC';
 
-		dol_syslog(get_class($this)."::getChildrenOfLines search children lines for line ".$id." sql=".$sql, LOG_DEBUG);
+		dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id." sql=".$sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{

From 7260f39d2121a71a9d966411315660e68c3980e0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Feb 2013 17:06:32 +0100
Subject: [PATCH 112/162] New: Support tag total_vat_x.y for vat rate x.y into
 ODT templates

---
 .../commande/doc/doc_generic_order_odt.modules.php    | 11 ++++++++++-
 .../facture/doc/doc_generic_invoice_odt.modules.php   | 11 ++++++++++-
 .../propale/doc/doc_generic_proposal_odt.modules.php  | 11 ++++++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 0ad0ecc0e7e..fff62466958 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -97,7 +97,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
     {
         global $conf;
 
-        return array(
+        $resarray=array(
             'object_id'=>$object->id,
             'object_ref'=>$object->ref,
             'object_ref_ext'=>$object->ref_ext,
@@ -120,6 +120,15 @@ class doc_generic_order_odt extends ModelePDFCommandes
             'object_note_private'=>$object->note,
             'object_note'=>$object->note_public,
         );
+        
+        // Add vat by rates
+        foreach ($object->lines as $line)
+        {
+        	if (empty($resarray['object_total_vat_'.$line->tva_tx])) $resarray['object_total_vat_'.$line->tva_tx]=0;
+        	$resarray['object_total_vat_'.$line->tva_tx]+=$line->total_tva;
+        }
+        
+        return $resarray;
     }
 
     /**
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index dcf8436636d..37e2b7e32b6 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -105,7 +105,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		$sumpayed = $object->getSommePaiement();
 		$alreadypayed=price($sumpayed,0,$outputlangs);
 
-        return array(
+        $resarray=array(
             'object_id'=>$object->id,
             'object_ref'=>$object->ref,
             'object_ref_ext'=>$object->ref_ext,
@@ -132,6 +132,15 @@ class doc_generic_invoice_odt extends ModelePDFFactures
             'object_already_payed'=>$alreadypayed,
             'object_remain_to_pay'=>price($object->total_ttc - $sumpayed,0,$outputlangs)
         );
+
+        // Add vat by rates
+		foreach ($object->lines as $line)
+		{
+			if (empty($resarray['object_total_vat_'.$line->tva_tx])) $resarray['object_total_vat_'.$line->tva_tx]=0;
+			$resarray['object_total_vat_'.$line->tva_tx]+=$line->total_tva;
+		}
+		
+        return $resarray;
     }
 
     /**
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index be0ac3f7d3f..d18c17735ae 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -97,7 +97,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
     {
         global $conf;
 
-        return array(
+        $resarray=array(
             'object_id'=>$object->id,
             'object_ref'=>$object->ref,
             'object_ref_ext'=>$object->ref_ext,
@@ -119,6 +119,15 @@ class doc_generic_proposal_odt extends ModelePDFPropales
             'object_note_private'=>$object->note,
             'object_note'=>$object->note_public,
         );
+        
+        // Add vat by rates
+        foreach ($object->lines as $line)
+        {
+        	if (empty($resarray['object_total_vat_'.$line->tva_tx])) $resarray['object_total_vat_'.$line->tva_tx]=0;
+        	$resarray['object_total_vat_'.$line->tva_tx]+=$line->total_tva;
+        }
+        
+        return $resarray;
     }
 
     /**

From e0bbb78f56de33605eafe6c600a2e4f9eeb72aa7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Feb 2013 17:28:07 +0100
Subject: [PATCH 113/162] Fix: Merge customer and prospect tab

---
 htdocs/comm/fiche.php           | 49 +++++++++++++++++----------------
 htdocs/core/lib/company.lib.php |  4 ++-
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index 397fb9da835..fcecbf0a552 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -386,29 +386,32 @@ if ($id > 0)
 	}
 	
 	// Level of prospect
-	print '<tr><td nowrap>';
-	print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
-	print $langs->trans('ProspectLevelShort');
-	print '<td>';
-	if ($action != 'editlevel' && $user->rights->societe->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;socid='.$object->id.'">'.img_edit($langs->trans('Modify'),1).'</a></td>';
-	print '</tr></table>';
-	print '</td><td colspan="3">';
-	if ($action == 'editlevel')
-		$formcompany->form_prospect_level($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->fk_prospectlevel,'prospect_level_id',1);
-	else
-		print $object->getLibProspLevel();
-	print "</td>";
-	print '</tr>';
-	
-	// Status
-	print '<tr><td>'.$langs->trans("StatusProsp").'</td><td colspan="2">'.$object->getLibProspCommStatut(4).'</td>';
-	print '<td>';
-	if ($object->stcomm_id != -1) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=-1&amp;action=cstc">'.img_action(0,-1).'</a>';
-	if ($object->stcomm_id !=  0) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=0&amp;action=cstc">'.img_action(0,0).'</a>';
-	if ($object->stcomm_id !=  1) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=1&amp;action=cstc">'.img_action(0,1).'</a>';
-	if ($object->stcomm_id !=  2) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=2&amp;action=cstc">'.img_action(0,2).'</a>';
-	if ($object->stcomm_id !=  3) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=3&amp;action=cstc">'.img_action(0,3).'</a>';
-	print '</td></tr>';
+	if ($object->client == 2 || $object->client == 3)
+	{
+		print '<tr><td nowrap>';
+		print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
+		print $langs->trans('ProspectLevel');
+		print '<td>';
+		if ($action != 'editlevel' && $user->rights->societe->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;socid='.$object->id.'">'.img_edit($langs->trans('Modify'),1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td colspan="3">';
+		if ($action == 'editlevel')
+			$formcompany->form_prospect_level($_SERVER['PHP_SELF'].'?socid='.$object->id,$object->fk_prospectlevel,'prospect_level_id',1);
+		else
+			print $object->getLibProspLevel();
+		print "</td>";
+		print '</tr>';
+		
+		// Status
+		print '<tr><td>'.$langs->trans("StatusProsp").'</td><td colspan="2">'.$object->getLibProspCommStatut(4).'</td>';
+		print '<td>';
+		if ($object->stcomm_id != -1) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=-1&amp;action=cstc">'.img_action(0,-1).'</a>';
+		if ($object->stcomm_id !=  0) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=0&amp;action=cstc">'.img_action(0,0).'</a>';
+		if ($object->stcomm_id !=  1) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=1&amp;action=cstc">'.img_action(0,1).'</a>';
+		if ($object->stcomm_id !=  2) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=2&amp;action=cstc">'.img_action(0,2).'</a>';
+		if ($object->stcomm_id !=  3) print '<a href="fiche.php?socid='.$object->id.'&amp;stcomm=3&amp;action=cstc">'.img_action(0,3).'</a>';
+		print '</td></tr>';
+	}
 
 	// Sales representative
 	include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 4fb851ce4d3..afd9522801a 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -45,7 +45,9 @@ function societe_prepare_head($object)
     if ($object->client==1 || $object->client==2 || $object->client==3 || (isset($object->object) && $object->object->client==1) || (isset($object->object) && $object->object->client==3))
     {
         $head[$h][0] = DOL_URL_ROOT.'/comm/fiche.php?socid='.$object->id;
-        $head[$h][1] = $langs->trans("Customer");
+        if ($object->client==2 || $object->client==3) $head[$h][1] = $langs->trans("Prospect");
+        if ($object->client==3)                       $head[$h][1] .= '/';
+        if ($object->client==1 || $object->client==3) $head[$h][1] .= $langs->trans("Customer");
         $head[$h][2] = 'customer';
         $h++;
     }

From 7c47dedbcee621211216c8ce3c3db316ec1ebfb6 Mon Sep 17 00:00:00 2001
From: Grand Philippe <contact@atoo-net.com>
Date: Fri, 15 Feb 2013 17:33:07 +0100
Subject: [PATCH 114/162] fix trad: begin change address instead of adresse

---
 htdocs/adherents/class/adherent.class.php    | 10 +++++-----
 htdocs/adherents/fiche.php                   |  4 ++--
 htdocs/adherents/liste.php                   |  2 +-
 htdocs/adherents/type.php                    |  2 +-
 htdocs/core/modules/modAdherent.class.php    | 10 +++++-----
 htdocs/install/mysql/tables/llx_adherent.sql |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 0eea1c6f5d7..8e9c75e2423 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -51,7 +51,7 @@ class Adherent extends CommonObject
     var $login;
     var $pass;
     var $societe;
-    var $adresse;
+    //var $adresse;
     var $address;
     var $cp;
     var $zip;
@@ -429,7 +429,7 @@ class Adherent extends CommonObject
         $sql.= ", login="   .($this->login?"'".$this->db->escape($this->login)."'":"null");
         $sql.= ", societe=" .($this->societe?"'".$this->db->escape($this->societe)."'":"null");
         $sql.= ", fk_soc="  .($this->fk_soc > 0?"'".$this->fk_soc."'":"null");
-        $sql.= ", adresse=" .($this->address?"'".$this->db->escape($this->address)."'":"null");
+        $sql.= ", address=" .($this->address?"'".$this->db->escape($this->address)."'":"null");
         $sql.= ", cp="      .($this->zip?"'".$this->db->escape($this->zip)."'":"null");
         $sql.= ", ville="   .($this->town?"'".$this->db->escape($this->town)."'":"null");
         $sql.= ", pays="          .($this->country_id>0?"'".$this->country_id."'":"null");
@@ -1019,7 +1019,7 @@ class Adherent extends CommonObject
     {
         global $langs;
 
-        $sql = "SELECT d.rowid, d.civilite, d.prenom as firstname, d.nom as lastname, d.societe, d.fk_soc, d.statut, d.public, d.adresse as address, d.cp as zip, d.ville as town, d.note,";
+        $sql = "SELECT d.rowid, d.civilite, d.prenom as firstname, d.nom as lastname, d.societe, d.fk_soc, d.statut, d.public, d.address, d.cp as zip, d.ville as town, d.note,";
         $sql.= " d.email, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass,";
         $sql.= " d.photo, d.fk_adherent_type, d.morphy, d.entity,";
         $sql.= " d.datec as datec,";
@@ -1065,7 +1065,7 @@ class Adherent extends CommonObject
                 $this->pass				= $obj->pass;
                 $this->societe			= $obj->societe;
                 $this->fk_soc			= $obj->fk_soc;
-                $this->adresse			= $obj->address;	// deprecated
+                //$this->adresse			= $obj->address;	// deprecated
                 $this->address			= $obj->address;
                 $this->cp				= $obj->zip;		// deprecated
                 $this->zip				= $obj->zip;
@@ -1824,7 +1824,7 @@ class Adherent extends CommonObject
         if ($this->login && ! empty($conf->global->LDAP_MEMBER_FIELD_LOGIN))      $info[$conf->global->LDAP_MEMBER_FIELD_LOGIN] = $this->login;
         if ($this->pass && ! empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD))    $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass;	// this->pass = mot de passe non crypte
         if ($this->poste && ! empty($conf->global->LDAP_MEMBER_FIELD_TITLE))      $info[$conf->global->LDAP_MEMBER_FIELD_TITLE] = $this->poste;
-        if ($this->adresse && ! empty($conf->global->LDAP_MEMBER_FIELD_ADDRESS))  $info[$conf->global->LDAP_MEMBER_FIELD_ADDRESS] = $this->adresse;
+        if ($this->address && ! empty($conf->global->LDAP_MEMBER_FIELD_ADDRESS))  $info[$conf->global->LDAP_MEMBER_FIELD_ADDRESS] = $this->address;
         if ($this->cp && ! empty($conf->global->LDAP_MEMBER_FIELD_ZIP))           $info[$conf->global->LDAP_MEMBER_FIELD_ZIP] = $this->cp;
         if ($this->ville && ! empty($conf->global->LDAP_MEMBER_FIELD_TOWN))       $info[$conf->global->LDAP_MEMBER_FIELD_TOWN] = $this->ville;
         if ($this->country_code && ! empty($conf->global->LDAP_MEMBER_FIELD_COUNTRY))     $info[$conf->global->LDAP_MEMBER_FIELD_COUNTRY] = $this->country_code;
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index f84990b94e5..d1c8beb6426 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -259,7 +259,7 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
 		$object->pass        = trim($_POST["pass"]);
 
 		$object->societe     = trim($_POST["societe"]);
-		$object->adresse     = trim($_POST["address"]);    // deprecated
+		//$object->adresse     = trim($_POST["address"]);    // deprecated
 		$object->address     = trim($_POST["address"]);
 		$object->cp          = trim($_POST["zipcode"]);    // deprecated
 		$object->zip         = trim($_POST["zipcode"]);
@@ -440,7 +440,7 @@ if ($action == 'add' && $user->rights->adherent->creer)
 	$object->firstname   = $prenom;
 	$object->lastname    = $nom;
 	$object->societe     = $societe;
-	$object->adresse     = $address; // deprecated
+	//$object->adresse     = $address; // deprecated
 	$object->address     = $address;
 	$object->cp          = $zip;     // deprecated
 	$object->zip         = $zip;
diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php
index 2363a3529d2..b19fcae8d85 100644
--- a/htdocs/adherents/liste.php
+++ b/htdocs/adherents/liste.php
@@ -104,7 +104,7 @@ if ($sall)
 	$sql.=" AND (";
 	if (is_numeric($sall)) $sql.= "d.rowid = ".$sall." OR ";
 	$sql.=" d.prenom LIKE '%".$sall."%' OR d.nom LIKE '%".$sall."%' OR d.societe LIKE '%".$sall."%'";
-	$sql.=" OR d.email LIKE '%".$sall."%' OR d.login LIKE '%".$sall."%' OR d.adresse LIKE '%".$sall."%'";
+	$sql.=" OR d.email LIKE '%".$sall."%' OR d.login LIKE '%".$sall."%' OR d.address LIKE '%".$sall."%'";
 	$sql.=" OR d.ville LIKE '%".$sall."%' OR d.note LIKE '%".$sall."%')";
 }
 if ($type > 0)
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 369f925bc7e..eaddb4866c4 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -416,7 +416,7 @@ if ($rowid > 0)
 		if ($sall)
 		{
 		    $sql.= " AND (d.prenom LIKE '%".$sall."%' OR d.nom LIKE '%".$sall."%' OR d.societe LIKE '%".$sall."%'";
-		    $sql.= " OR d.email LIKE '%".$sall."%' OR d.login LIKE '%".$sall."%' OR d.adresse LIKE '%".$sall."%'";
+		    $sql.= " OR d.email LIKE '%".$sall."%' OR d.login LIKE '%".$sall."%' OR d.address LIKE '%".$sall."%'";
 		    $sql.= " OR d.ville LIKE '%".$sall."%' OR d.note LIKE '%".$sall."%')";
 		}
 		if ($status != '')
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 281a672c60d..4dea8571657 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -172,9 +172,9 @@ class modAdherent extends DolibarrModules
         $this->export_code[$r]=$this->rights_class.'_'.$r;
         $this->export_label[$r]='MembersAndSubscriptions';
         $this->export_permission[$r]=array(array("adherent","export"));
-        $this->export_fields_array[$r]=array('a.rowid'=>'Id','a.civilite'=>"UserTitle",'a.nom'=>"Lastname",'a.prenom'=>"Firstname",'a.login'=>"Login",'a.morphy'=>'Nature','a.societe'=>'Company','a.adresse'=>"Address",'a.cp'=>"Zip",'a.ville'=>"Town",'a.pays'=>"Country",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.naiss'=>"Birthday",'a.statut'=>"Status",'a.photo'=>"Photo",'a.note'=>"Note",'a.datec'=>'DateCreation','a.datevalid'=>'DateValidation','a.tms'=>'DateLastModification','a.datefin'=>'DateEndSubscription','ta.rowid'=>'MemberTypeId','ta.libelle'=>'MemberTypeLabel','c.rowid'=>'SubscriptionId','c.dateadh'=>'DateSubscription','c.cotisation'=>'Amount');
-        $this->export_TypeFields_array[$r]=array('a.civilite'=>"Text",'a.nom'=>"Text",'a.prenom'=>"Text",'a.login'=>"Text",'a.morphy'=>'Text','a.societe'=>'Text','a.adresse'=>"Text",'a.cp'=>"Text",'a.ville'=>"Text",'a.pays'=>"Text",'a.phone'=>"Text",'a.phone_perso'=>"Text",'a.phone_mobile'=>"Text",'a.email'=>"Text",'a.naiss'=>"Date",'a.statut'=>"Status",'a.note'=>"Text",'a.datec'=>'Date','a.datevalid'=>'Date','a.tms'=>'Date','a.datefin'=>'Date','ta.rowid'=>'List:fk_adherent_type:libelle','ta.libelle'=>'Text','c.dateadh'=>'Date','c.cotisation'=>'Number');
-        $this->export_entities_array[$r]=array('a.rowid'=>'member','a.civilite'=>"member",'a.nom'=>"member",'a.prenom'=>"member",'a.login'=>"member",'a.morphy'=>'member','a.societe'=>'member','a.adresse'=>"member",'a.cp'=>"member",'a.ville'=>"member",'a.pays'=>"member",'a.phone'=>"member",'a.phone_perso'=>"member",'a.phone_mobile'=>"member",'a.email'=>"member",'a.naiss'=>"member",'a.statut'=>"member",'a.photo'=>"member",'a.note'=>"member",'a.datec'=>'member','a.datevalid'=>'member','a.tms'=>'member','a.datefin'=>'member','ta.rowid'=>'member_type','ta.libelle'=>'member_type','c.rowid'=>'subscription','c.dateadh'=>'subscription','c.cotisation'=>'subscription');
+        $this->export_fields_array[$r]=array('a.rowid'=>'Id','a.civilite'=>"UserTitle",'a.nom'=>"Lastname",'a.prenom'=>"Firstname",'a.login'=>"Login",'a.morphy'=>'Nature','a.societe'=>'Company','a.address'=>"Address",'a.cp'=>"Zip",'a.ville'=>"Town",'a.pays'=>"Country",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.naiss'=>"Birthday",'a.statut'=>"Status",'a.photo'=>"Photo",'a.note'=>"Note",'a.datec'=>'DateCreation','a.datevalid'=>'DateValidation','a.tms'=>'DateLastModification','a.datefin'=>'DateEndSubscription','ta.rowid'=>'MemberTypeId','ta.libelle'=>'MemberTypeLabel','c.rowid'=>'SubscriptionId','c.dateadh'=>'DateSubscription','c.cotisation'=>'Amount');
+        $this->export_TypeFields_array[$r]=array('a.civilite'=>"Text",'a.nom'=>"Text",'a.prenom'=>"Text",'a.login'=>"Text",'a.morphy'=>'Text','a.societe'=>'Text','a.address'=>"Text",'a.cp'=>"Text",'a.ville'=>"Text",'a.pays'=>"Text",'a.phone'=>"Text",'a.phone_perso'=>"Text",'a.phone_mobile'=>"Text",'a.email'=>"Text",'a.naiss'=>"Date",'a.statut'=>"Status",'a.note'=>"Text",'a.datec'=>'Date','a.datevalid'=>'Date','a.tms'=>'Date','a.datefin'=>'Date','ta.rowid'=>'List:fk_adherent_type:libelle','ta.libelle'=>'Text','c.dateadh'=>'Date','c.cotisation'=>'Number');
+        $this->export_entities_array[$r]=array('a.rowid'=>'member','a.civilite'=>"member",'a.nom'=>"member",'a.prenom'=>"member",'a.login'=>"member",'a.morphy'=>'member','a.societe'=>'member','a.address'=>"member",'a.cp'=>"member",'a.ville'=>"member",'a.pays'=>"member",'a.phone'=>"member",'a.phone_perso'=>"member",'a.phone_mobile'=>"member",'a.email'=>"member",'a.naiss'=>"member",'a.statut'=>"member",'a.photo'=>"member",'a.note'=>"member",'a.datec'=>'member','a.datevalid'=>'member','a.tms'=>'member','a.datefin'=>'member','ta.rowid'=>'member_type','ta.libelle'=>'member_type','c.rowid'=>'subscription','c.dateadh'=>'subscription','c.cotisation'=>'subscription');
 		// Add extra fields
 		$sql="SELECT name, label FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'member'";
 		$resql=$this->db->query($sql);
@@ -207,7 +207,7 @@ class modAdherent extends DolibarrModules
         $this->import_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon
         $this->import_tables_array[$r]=array('a'=>MAIN_DB_PREFIX.'adherent','extra'=>MAIN_DB_PREFIX.'adherent_extrafields');
         $this->import_tables_creator_array[$r]=array('a'=>'fk_user_author');    // Fields to store import user id
-        $this->import_fields_array[$r]=array('a.civilite'=>"UserTitle",'a.nom'=>"Lastname*",'a.prenom'=>"Firstname",'a.login'=>"Login*","a.pass"=>"Password","a.fk_adherent_type"=>"MemberType*",'a.morphy'=>'Nature*','a.societe'=>'Company','a.adresse'=>"Address",'a.cp'=>"Zip",'a.ville'=>"Town",'a.pays'=>"Country",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.naiss'=>"Birthday",'a.statut'=>"Status*",'a.photo'=>"Photo",'a.note'=>"Note",'a.datec'=>'DateCreation','a.datefin'=>'DateEndSubscription');
+        $this->import_fields_array[$r]=array('a.civilite'=>"UserTitle",'a.nom'=>"Lastname*",'a.prenom'=>"Firstname",'a.login'=>"Login*","a.pass"=>"Password","a.fk_adherent_type"=>"MemberType*",'a.morphy'=>'Nature*','a.societe'=>'Company','a.address'=>"Address",'a.cp'=>"Zip",'a.ville'=>"Town",'a.pays'=>"Country",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.naiss'=>"Birthday",'a.statut'=>"Status*",'a.photo'=>"Photo",'a.note'=>"Note",'a.datec'=>'DateCreation','a.datefin'=>'DateEndSubscription');
 		// Add extra fields
 		$sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'member'";
 		$resql=$this->db->query($sql);
@@ -223,7 +223,7 @@ class modAdherent extends DolibarrModules
 		// End add extra fields
 		$this->import_fieldshidden_array[$r]=array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'adherent');    // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_regex_array[$r]=array('a.civilite'=>'code@'.MAIN_DB_PREFIX.'c_civilite','a.fk_adherent_type'=>'rowid@'.MAIN_DB_PREFIX.'adherent_type','a.morphy'=>'(phy|mor)','a.statut'=>'^[0|1]','a.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$','a.datefin'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
-        $this->import_examplevalues_array[$r]=array('a.civilite'=>"MR",'a.nom'=>'Smith','a.prenom'=>'John','a.login'=>'jsmith','a.pass'=>'passofjsmith','a.fk_adherent_type'=>'1','a.morphy'=>'"mor" or "phy"','a.societe'=>'JS company','a.adresse'=>'21 jump street','a.cp'=>'55000','a.ville'=>'New York','a.pays'=>'1','a.email'=>'jsmith@example.com','a.naiss'=>'1972-10-10','a.statut'=>"0 or 1",'a.note'=>"This is a comment on member",'a.datec'=>dol_print_date($now,'%Y-%m-%d'),'a.datefin'=>dol_print_date(dol_time_plus_duree($now, 1, 'y'),'%Y-%m-%d'));
+        $this->import_examplevalues_array[$r]=array('a.civilite'=>"MR",'a.nom'=>'Smith','a.prenom'=>'John','a.login'=>'jsmith','a.pass'=>'passofjsmith','a.fk_adherent_type'=>'1','a.morphy'=>'"mor" or "phy"','a.societe'=>'JS company','a.address'=>'21 jump street','a.cp'=>'55000','a.ville'=>'New York','a.pays'=>'1','a.email'=>'jsmith@example.com','a.naiss'=>'1972-10-10','a.statut'=>"0 or 1",'a.note'=>"This is a comment on member",'a.datec'=>dol_print_date($now,'%Y-%m-%d'),'a.datefin'=>dol_print_date(dol_time_plus_duree($now, 1, 'y'),'%Y-%m-%d'));
     }
 
 
diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql
index 3ab580b5de2..90727f92419 100644
--- a/htdocs/install/mysql/tables/llx_adherent.sql
+++ b/htdocs/install/mysql/tables/llx_adherent.sql
@@ -39,7 +39,7 @@ create table llx_adherent
   morphy           varchar(3) NOT NULL, -- personne morale / personne physique
   societe          varchar(50),
   fk_soc           integer NULL,		-- Link to third party linked to member
-  adresse          text,
+  address          text,
   cp               varchar(30),
   ville            varchar(50),
   fk_departement   integer,

From 145573ea79756c81b4195cfc5c74af039ab7667a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Feb 2013 17:37:30 +0100
Subject: [PATCH 115/162] Qual: Removed useless code for old modules. There is
 hook now to do same job.

---
 htdocs/user/fiche.php | 84 -------------------------------------------
 1 file changed, 84 deletions(-)

diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index cf0e0170c94..451be57c976 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -196,11 +196,6 @@ if ($action == 'add' && $canadduser)
         	}
         }
 
-        // FIXME external module
-        $object->webcal_login	= $_POST["webcal_login"];
-        $object->phenix_login	= $_POST["phenix_login"];
-        $object->phenix_pass	= $_POST["phenix_pass"];
-
         // If multicompany is off, admin users must all be on entity 0.
         if (! empty($conf->multicompany->enabled))
         {
@@ -342,11 +337,6 @@ if ($action == 'update' && ! $_POST["cancel"])
             	}
             }
 
-            // FIXME external module
-            $object->webcal_login	= $_POST["webcal_login"];
-            $object->phenix_login	= $_POST["phenix_login"];
-            $object->phenix_pass	= $_POST["phenix_pass"];
-
             if (! empty($conf->multicompany->enabled))
             {
             	if (! empty($_POST["superadmin"]))
@@ -936,23 +926,6 @@ if (($action == 'create') || ($action == 'adduserldap'))
     	}
     }
 
-    // Module Webcalendar
-    // TODO external module
-    if (! empty($conf->webcalendar->enabled))
-    {
-        print "<tr>".'<td valign="top">'.$langs->trans("LoginWebcal").'</td>';
-        print '<td><input size="30" type="text" name="webcal_login" value="'.$_POST["webcal_login"].'"></td></tr>';
-    }
-
-    // Module Phenix
-    // TODO external module
-    if (! empty($conf->phenix->enabled))
-    {
-        print "<tr>".'<td valign="top">'.$langs->trans("LoginPenix").'</td>';
-        print '<td><input size="30" type="text" name="phenix_login" value="'.$_POST["phenix_login"].'"></td></tr>';
-        print "<tr>".'<td valign="top">'.$langs->trans("PassPenix").'</td>';
-        print '<td><input size="30" type="text" name="phenix_pass" value="'.$_POST["phenix_pass"].'"></td></tr>';
-    }
  	print "</table>\n";
 
     print '<center><br><input class="button" value="'.$langs->trans("CreateUser").'" name="create" type="submit"></center>';
@@ -1089,9 +1062,6 @@ else
             if (isset($conf->authmode) && preg_match('/myopenid/',$conf->authmode)) $rowspan++;
             if (! empty($conf->societe->enabled)) $rowspan++;
             if (! empty($conf->adherent->enabled)) $rowspan++;
-            if (! empty($conf->webcalendar->enabled)) $rowspan++;	// TODO external module
-            if (! empty($conf->phenix->enabled)) $rowspan+=2;		// TODO external module
-
 
             // Lastname
             print '<tr><td valign="top">'.$langs->trans("Lastname").'</td>';
@@ -1256,29 +1226,6 @@ else
                 print "</tr>\n";
             }
 
-            // Module Webcalendar
-            // TODO external module
-            if (! empty($conf->webcalendar->enabled))
-            {
-                $langs->load("other");
-                print '<tr><td valign="top">'.$langs->trans("LoginWebcal").'</td>';
-                print '<td>'.$object->webcal_login.'&nbsp;</td>';
-                print '</tr>'."\n";
-            }
-
-            // Module Phenix
-            // TODO external module
-            if (! empty($conf->phenix->enabled))
-            {
-                $langs->load("other");
-                print '<tr><td valign="top">'.$langs->trans("LoginPhenix").'</td>';
-                print '<td>'.$object->phenix_login.'&nbsp;</td>';
-                print "</tr>\n";
-                print '<tr><td valign="top">'.$langs->trans("PassPhenix").'</td>';
-                print '<td>'.preg_replace('/./i','*',$object->phenix_pass_crypted).'&nbsp;</td>';
-                print '</tr>'."\n";
-            }
-
             // Company / Contact
             if (! empty($conf->societe->enabled))
             {
@@ -1575,8 +1522,6 @@ else
 
             if (! empty($conf->societe->enabled)) $rowspan++;
             if (! empty($conf->adherent->enabled)) $rowspan++;
-            if (! empty($conf->webcalendar->enabled)) $rowspan++;	// TODO external module
-            if (! empty($conf->phenix->enabled)) $rowspan+=2;		// TODO external module
 
             print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>';
             print '<td colspan="2">';
@@ -1867,35 +1812,6 @@ else
             print $object->getLibStatut(4);
             print '</td></tr>';
 
-            // Module Webcalendar
-            // TODO external module
-            if (! empty($conf->webcalendar->enabled))
-            {
-                $langs->load("other");
-                print "<tr>".'<td valign="top">'.$langs->trans("LoginWebcal").'</td>';
-                print '<td>';
-                if ($caneditfield) print '<input size="30" type="text" class="flat" name="webcal_login" value="'.$object->webcal_login.'">';
-                else print $object->webcal_login;
-                print '</td></tr>';
-            }
-
-            // Module Phenix
-            // TODO external module
-            if (! empty($conf->phenix->enabled))
-            {
-                $langs->load("other");
-                print "<tr>".'<td valign="top">'.$langs->trans("LoginPhenix").'</td>';
-                print '<td>';
-                if ($caneditfield) print '<input size="30" type="text" class="flat" name="phenix_login" value="'.$object->phenix_login.'">';
-                else print $object->phenix_login;
-                print '</td></tr>';
-                print "<tr>".'<td valign="top">'.$langs->trans("PassPhenix").'</td>';
-                print '<td>';
-                if ($caneditfield) print '<input size="30" type="password" class="flat" name="phenix_pass" value="'.$object->phenix_pass_crypted.'">';
-                else print preg_replace('/./i','*',$object->phenix_pass_crypted);
-                print '</td></tr>';
-            }
-
             // Company / Contact
             if (! empty($conf->societe->enabled))
             {

From b1ee14ce6012a108257c20055d4fdc8cf8132eae Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 15 Feb 2013 18:39:27 +0100
Subject: [PATCH 116/162] New: Can define a hierarchical responsible on users.

---
 ChangeLog                             |   1 +
 htdocs/core/class/html.form.class.php |   4 +-
 htdocs/langs/en_US/users.lang         |   3 +-
 htdocs/langs/fr_FR/users.lang         |   3 +-
 htdocs/user/class/user.class.php      |   1 +
 htdocs/user/fiche.php                 | 101 ++++++++++++++++----------
 6 files changed, 69 insertions(+), 44 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 294c09a6997..68452e0ca4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ For users:
 - New: Some performance enhancements.
 - New: Can attach files onto trip and expenses modules.
 - New: Add option MAIN_PDF_TITLE_BACKGROUND_COLOR
+- New: Can define a hierarchical responsible on user
 
 For developers:
 - System of menu managers has been rewritten to reduce code to do same things. 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 28dee6f9383..dcf70443fd8 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -994,7 +994,7 @@ class Form
         global $conf,$user,$langs;
 
         // If no preselected user defined, we take current user
-        if ($selected < -1 && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE)) $selected=$user->id;
+        if ((is_numeric($selected) && ($selected < -1 || empty($selected))) && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE)) $selected=$user->id;
 
         // Permettre l'exclusion d'utilisateurs
         if (is_array($exclude))	$excludeUsers = implode("','",$exclude);
@@ -1043,7 +1043,7 @@ class Form
             if ($num)
             {
                 $out.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled="disabled"':'').'>';
-                if ($show_empty) $out.= '<option value="-1"'.($selected==-1?' selected="selected"':'').'>&nbsp;</option>'."\n";
+                if ($show_empty) $out.= '<option value="-1"'.((empty($selected) || $selected==-1)?' selected="selected"':'').'>&nbsp;</option>'."\n";
 
                 $userstatic=new User($this->db);
 
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index c6f9ba97874..e9a49faebea 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -113,4 +113,5 @@ NameToCreate=Name of third party to create
 YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
 NbOfUsers=Nb of users
-DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
\ No newline at end of file
+DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
+HierarchicalResponsible=Hierarchical responsible
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 40a6f7fb1fe..95ff8a405fc 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -113,4 +113,5 @@ NameToCreate=Nom du tiers à créer
 YourRole=Vos rôles
 YourQuotaOfUsersIsReached=Votre quota d'utilisateurs actifs est atteint !
 NbOfUsers=Nb d'utilisateurs
-DontDowngradeSuperAdmin=Seul un superadmin peut rétrograder un superadmin
\ No newline at end of file
+DontDowngradeSuperAdmin=Seul un superadmin peut rétrograder un superadmin
+HierarchicalResponsible=Responsable hierarchique
\ No newline at end of file
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 5d0fd96f4bc..6b144c79a08 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1140,6 +1140,7 @@ class User extends CommonObject
 		$sql.= ", note = '".$this->db->escape($this->note)."'";
 		$sql.= ", photo = ".($this->photo?"'".$this->db->escape($this->photo)."'":"null");
 		$sql.= ", openid = ".($this->openid?"'".$this->db->escape($this->openid)."'":"null");
+		$sql.= ", fk_user = ".($this->fk_user > 0?"'".$this->db->escape($this->fk_user)."'":"null");
 		$sql.= ", entity = '".$this->entity."'";
 		$sql.= " WHERE rowid = ".$this->id;
 
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 451be57c976..7988b68dfd2 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -327,6 +327,7 @@ if ($action == 'update' && ! $_POST["cancel"])
             $object->job		= GETPOST("job");
             $object->signature	= GETPOST("signature");
             $object->openid		= GETPOST("openid");
+            $object->fk_user    = GETPOST("fk_user")>0?GETPOST("fk_user"):0;
 
             // Get extra fields
             foreach($_POST as $key => $value)
@@ -1049,6 +1050,8 @@ else
          */
         if ($action != 'edit')
         {
+            $rowspan=16;
+        	
             print '<table class="border" width="100%">';
 
             // Ref
@@ -1058,7 +1061,6 @@ else
             print '</td>';
             print '</tr>'."\n";
 
-            $rowspan=15;
             if (isset($conf->authmode) && preg_match('/myopenid/',$conf->authmode)) $rowspan++;
             if (! empty($conf->societe->enabled)) $rowspan++;
             if (! empty($conf->adherent->enabled)) $rowspan++;
@@ -1146,22 +1148,6 @@ else
             }
             print '</td></tr>'."\n";
 
-            // Multicompany
-            if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
-            {
-            	print '<tr><td valign="top">'.$langs->trans("Entity").'</td><td width="75%" class="valeur">';
-            	if ($object->admin && ! $object->entity)
-            	{
-            		print $langs->trans("AllEntities");
-            	}
-            	else
-            	{
-            		$mc->getInfo($object->entity);
-            		print $mc->label;
-            	}
-            	print "</td></tr>\n";
-            }
-
             // Type
             print '<tr><td valign="top">'.$langs->trans("Type").'</td><td>';
             $type=$langs->trans("Internal");
@@ -1170,7 +1156,7 @@ else
             if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')';
             print '</td></tr>'."\n";
 
-            // ldap sid
+            // Ldap sid
             if ($object->ldap_sid)
             {
             	print '<tr><td valign="top">'.$langs->trans("Type").'</td><td>';
@@ -1202,7 +1188,19 @@ else
             print '<tr><td valign="top">'.$langs->trans('Signature').'</td><td>';
             print dol_textishtml($object->signature)?$object->signature:dol_nl2br($object->signature,1,false);
             print "</td></tr>\n";
-
+            
+            // Hierarchy
+            print '<tr><td valign="top">'.$langs->trans("HierarchicalResponsible").'</td>';
+            print '<td>';
+            if (empty($object->fk_user)) print $langs->trans("None");
+            else {
+            	$huser=new User($db);
+            	$huser->fetch($object->fk_user);
+            	print $huser->getNomUrl(1);
+            }
+            print '</td>';
+            print "</tr>\n";
+            
             // Statut
             print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
             print '<td>';
@@ -1225,7 +1223,7 @@ else
                 print '<td>'.$object->openid.'</td>';
                 print "</tr>\n";
             }
-
+            
             // Company / Contact
             if (! empty($conf->societe->enabled))
             {
@@ -1274,6 +1272,22 @@ else
                 print '</tr>'."\n";
             }
 
+            // Multicompany
+            if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+            {
+            	print '<tr><td valign="top">'.$langs->trans("Entity").'</td><td width="75%" class="valeur">';
+            	if ($object->admin && ! $object->entity)
+            	{
+            		print $langs->trans("AllEntities");
+            	}
+            	else
+            	{
+            		$mc->getInfo($object->entity);
+            		print $mc->label;
+            	}
+            	print "</td></tr>\n";
+            }
+            
           	// Other attributes
 			$parameters=array('colspan' => ' colspan="2"');
 			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
@@ -1512,14 +1526,14 @@ else
 
         if ($action == 'edit' && ($canedituser || ($user->id == $object->id)))
         {
-            print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
+            $rowspan=14;
+
+        	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
             print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
             print '<input type="hidden" name="action" value="update">';
             print '<input type="hidden" name="entity" value="'.$object->entity.'">';
             print '<table width="100%" class="border">';
 
-            $rowspan=13;
-
             if (! empty($conf->societe->enabled)) $rowspan++;
             if (! empty($conf->adherent->enabled)) $rowspan++;
 
@@ -1693,21 +1707,6 @@ else
                 print '</td></tr>';
             }
 
-            // Multicompany
-            if (! empty($conf->multicompany->enabled))
-            {
-            	if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
-            	{
-            		print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>';
-            		print "<td>".$mc->select_entities($object->entity);
-            		print "</td></tr>\n";
-            	}
-            	else
-            	{
-            		print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-            	}
-            }
-
            	// Type
            	print '<tr><td width="25%" valign="top">'.$langs->trans("Type").'</td>';
            	print '<td>';
@@ -1788,7 +1787,7 @@ else
             print '<td>';
             print '<textarea name="signature" rows="5" cols="90">'.dol_htmlentitiesbr_decode($object->signature).'</textarea>';
             print '</td></tr>';
-
+            
             // openid
             if (isset($conf->authmode) && preg_match('/myopenid/',$conf->authmode))
             {
@@ -1806,12 +1805,34 @@ else
                 print '</td></tr>';
             }
 
+            // Hierarchy
+            print '<tr><td valign="top">'.$langs->trans("HierarchicalResponsible").'</td>';
+            print '<td>';
+            print $form->select_dolusers($object->fk_user,'fk_user',1,array($object->id));
+            print '</td>';
+            print "</tr>\n";
+
             // Statut
             print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
             print '<td>';
             print $object->getLibStatut(4);
             print '</td></tr>';
-
+            
+            // Multicompany
+            if (! empty($conf->multicompany->enabled))
+            {
+            	if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+            	{
+            		print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>';
+            		print "<td>".$mc->select_entities($object->entity);
+            		print "</td></tr>\n";
+            	}
+            	else
+            	{
+            		print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
+            	}
+            }
+            
             // Company / Contact
             if (! empty($conf->societe->enabled))
             {

From 12317d03711a65d7ae32ff94a1a4f9fba70a1aa6 Mon Sep 17 00:00:00 2001
From: Grand Philippe <contact@atoo-net.com>
Date: Fri, 15 Feb 2013 19:18:26 +0100
Subject: [PATCH 117/162] fix trad : change adresse versus address

---
 htdocs/commande/class/commande.class.php     | 8 ++++----
 htdocs/install/mysql/tables/llx_commande.sql | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 335757c59d6..15a42841002 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -66,7 +66,7 @@ class Commande extends CommonOrder
     var $demand_reason_id;
     var $demand_reason_code;
     var $fk_delivery_address;
-    var $adresse;
+    var $address;
     var $date;				// Date commande
     var $date_commande;		// Date commande (deprecated)
     var $date_livraison;	// Date livraison souhaitee
@@ -631,7 +631,7 @@ class Commande extends CommonOrder
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."commande (";
         $sql.= " ref, fk_soc, date_creation, fk_user_author, fk_projet, date_commande, source, note, note_public, ref_client, ref_int";
-        $sql.= ", model_pdf, fk_cond_reglement, fk_mode_reglement, fk_availability, fk_input_reason, date_livraison, fk_adresse_livraison";
+        $sql.= ", model_pdf, fk_cond_reglement, fk_mode_reglement, fk_availability, fk_input_reason, date_livraison, fk_delivery_address";
         $sql.= ", remise_absolue, remise_percent";
         $sql.= ", entity";
         $sql.= ")";
@@ -1240,7 +1240,7 @@ class Commande extends CommonOrder
         $sql.= ', c.date_commande';
         $sql.= ', c.date_livraison';
         $sql.= ', c.fk_projet, c.remise_percent, c.remise, c.remise_absolue, c.source, c.facture as billed';
-        $sql.= ', c.note as note_private, c.note_public, c.ref_client, c.ref_ext, c.ref_int, c.model_pdf, c.fk_adresse_livraison, c.extraparams';
+        $sql.= ', c.note as note_private, c.note_public, c.ref_client, c.ref_ext, c.ref_int, c.model_pdf, c.fk_delivery_address, c.extraparams';
         $sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
         $sql.= ', cr.code as cond_reglement_code, cr.libelle as cond_reglement_libelle, cr.libelle_facture as cond_reglement_libelle_doc';
         $sql.= ', ca.code as availability_code';
@@ -1301,7 +1301,7 @@ class Commande extends CommonOrder
                 $this->demand_reason_id		= $obj->fk_input_reason;
                 $this->demand_reason_code	= $obj->demand_reason_code;
                 $this->date_livraison		= $this->db->jdate($obj->date_livraison);
-                $this->fk_delivery_address	= $obj->fk_adresse_livraison;
+                $this->fk_delivery_address	= $obj->fk_delivery_address;
 
                 $this->extraparams			= (array) json_decode($obj->extraparams, true);
 
diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql
index bc5312b1fe2..0ef0eddb739 100644
--- a/htdocs/install/mysql/tables/llx_commande.sql
+++ b/htdocs/install/mysql/tables/llx_commande.sql
@@ -63,7 +63,7 @@ create table llx_commande
   date_livraison		date 	  default NULL,
   fk_availability		integer NULL,
   fk_input_reason		integer,
-  fk_adresse_livraison	integer,						-- delivery address (deprecated)
+  fk_delivery_address	integer,						-- delivery address (deprecated)
   import_key			varchar(14),
   extraparams			varchar(255)					-- for stock other parameters with json format
   

From 2bfd6c40d0e7bba5f05f06a96580360057749b30 Mon Sep 17 00:00:00 2001
From: Grand Philippe <contact@atoo-net.com>
Date: Fri, 15 Feb 2013 19:26:09 +0100
Subject: [PATCH 118/162] fix trad : change adresse versus address

---
 htdocs/compta/dons/class/don.class.php        | 20 +++++++++----------
 htdocs/compta/dons/fiche.php                  | 10 +++++-----
 .../modules/dons/html_cerfafr.modules.php     |  2 +-
 htdocs/install/mysql/tables/llx_don.sql       |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php
index e4ee40df7c3..4942c8f3f7e 100644
--- a/htdocs/compta/dons/class/don.class.php
+++ b/htdocs/compta/dons/class/don.class.php
@@ -42,7 +42,7 @@ class Don extends CommonObject
     var $prenom;
     var $nom;
     var $societe;
-    var $adresse;
+    var $address;
     var $cp;
     var $ville;
     var $pays;
@@ -188,7 +188,7 @@ class Don extends CommonObject
         $this->amount = 100;
         $this->public = 1;
         $this->societe = 'The Company';
-        $this->adresse = 'Twist road';
+        $this->address = 'Twist road';
         $this->cp = '99999';
         $this->ville = 'Town';
         $this->note_public='SPECIMEN';
@@ -217,7 +217,7 @@ class Don extends CommonObject
             }
         }
 
-        if (dol_strlen(trim($this->adresse)) == 0)
+        if (dol_strlen(trim($this->address)) == 0)
         {
             $error_string[$err] = "L'adresse saisie est invalide";
             $err++;
@@ -297,7 +297,7 @@ class Don extends CommonObject
         global $conf;
 
         // Clean parameters
-        $this->address=($this->address>0?$this->address:$this->adresse);
+        $this->address=($this->address>0?$this->address:$this->address);
         $this->zip=($this->zip>0?$this->zip:$this->cp);
         $this->town=($this->town>0?$this->town:$this->ville);
         $this->country_id=($this->country_id>0?$this->country_id:$this->fk_pays);
@@ -313,7 +313,7 @@ class Don extends CommonObject
         $sql.= ", prenom";
         $sql.= ", nom";
         $sql.= ", societe";
-        $sql.= ", adresse";
+        $sql.= ", address";
         $sql.= ", cp";
         $sql.= ", ville";
         $sql.= ", pays";
@@ -334,7 +334,7 @@ class Don extends CommonObject
         $sql.= ", '".$this->db->escape($this->prenom)."'";
         $sql.= ", '".$this->db->escape($this->nom)."'";
         $sql.= ", '".$this->db->escape($this->societe)."'";
-        $sql.= ", '".$this->db->escape($this->adresse)."'";
+        $sql.= ", '".$this->db->escape($this->address)."'";
         $sql.= ", '".$this->db->escape($this->zip)."'";
         $sql.= ", '".$this->db->escape($this->town)."'";
         $sql.= ", '".$this->db->escape($this->country)."'"; // TODO use country_id
@@ -382,7 +382,7 @@ class Don extends CommonObject
     function update($user)
     {
         // Clean parameters
-        $this->address=($this->address>0?$this->address:$this->adresse);
+        $this->address=($this->address>0?$this->address:$this->address);
         $this->zip=($this->zip>0?$this->zip:$this->cp);
         $this->town=($this->town>0?$this->town:$this->ville);
         $this->country_id=($this->country_id>0?$this->country_id:$this->fk_pays);
@@ -394,7 +394,7 @@ class Don extends CommonObject
         $sql .= ",prenom = '".$this->db->escape($this->prenom)."'";
         $sql .= ",nom='".$this->db->escape($this->nom)."'";
         $sql .= ",societe='".$this->db->escape($this->societe)."'";
-        $sql .= ",adresse='".$this->db->escape($this->address)."'";
+        $sql .= ",address='".$this->db->escape($this->address)."'";
         $sql .= ",cp='".$this->db->escape($this->zip)."'";
         $sql .= ",ville='".$this->db->escape($this->town)."'";
         $sql .= ",pays='".$this->db->escape($this->country)."'"; // TODO use country_id
@@ -463,7 +463,7 @@ class Don extends CommonObject
         global $conf;
 
         $sql = "SELECT d.rowid, d.datec, d.tms as datem, d.datedon,";
-        $sql.= " d.prenom, d.nom, d.societe, d.amount, d.fk_statut, d.adresse, d.cp, d.ville, d.pays, d.public, d.amount, d.fk_paiement, d.note, cp.libelle, d.email, d.phone, d.phone_mobile, d.fk_don_projet,";
+        $sql.= " d.prenom, d.nom, d.societe, d.amount, d.fk_statut, d.address, d.cp, d.ville, d.pays, d.public, d.amount, d.fk_paiement, d.note, cp.libelle, d.email, d.phone, d.phone_mobile, d.fk_don_projet,";
         $sql.= " p.title as project_label";
         $sql.= " FROM ".MAIN_DB_PREFIX."don as d";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_don_projet";
@@ -487,7 +487,7 @@ class Don extends CommonObject
                 $this->nom            = $obj->nom;
                 $this->societe        = $obj->societe;
                 $this->statut         = $obj->fk_statut;
-                $this->adresse        = $obj->adresse;
+                $this->address        = $obj->address;
                 $this->cp             = $obj->cp;
                 $this->ville          = $obj->ville;
                 $this->zip            = $obj->cp;
diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php
index 6ba13a19631..5ea563fbf14 100644
--- a/htdocs/compta/dons/fiche.php
+++ b/htdocs/compta/dons/fiche.php
@@ -88,7 +88,7 @@ if ($action == 'update')
 		$don->prenom      = $_POST["prenom"];
 		$don->nom         = $_POST["nom"];
 		$don->societe     = $_POST["societe"];
-		$don->adresse     = $_POST["adresse"];
+		$don->address     = $_POST["address"];
 		$don->amount      = price2num($_POST["amount"]);
 		$don->cp          = $_POST["zipcode"];
 		$don->ville       = $_POST["town"];
@@ -140,7 +140,7 @@ if ($action == 'add')
 		$don->prenom      = $_POST["prenom"];
 		$don->nom         = $_POST["nom"];
 		$don->societe     = $_POST["societe"];
-		$don->adresse     = $_POST["adresse"];
+		$don->address     = $_POST["address"];
 		$don->amount      = price2num($_POST["amount"]);
 		$don->cp          = $_POST["zipcode"];
 		$don->ville       = $_POST["town"];
@@ -300,7 +300,7 @@ if ($action == 'create')
 	print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="prenom" value="'.$_POST["prenom"].'" size="40"></td></tr>';
 	print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="nom" value="'.$_POST["nom"].'" size="40"></td></tr>';
 	print "<tr>".'<td>'.$langs->trans("Address").'</td><td>';
-	print '<textarea name="adresse" wrap="soft" cols="40" rows="3">'.$_POST["adresse"].'</textarea></td></tr>';
+	print '<textarea name="address" wrap="soft" cols="40" rows="3">'.$_POST["address"].'</textarea></td></tr>';
 
     // Zip / Town
     print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
@@ -390,7 +390,7 @@ if (! empty($id) && $action == 'edit')
 	print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="prenom" size="40" value="'.$don->prenom.'"></td></tr>';
 	print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="nom" size="40" value="'.$don->nom.'"></td></tr>';
 	print "<tr>".'<td>'.$langs->trans("Address").'</td><td>';
-	print '<textarea name="adresse" wrap="soft" cols="40" rows="'.ROWS_3.'">'.$don->adresse.'</textarea></td></tr>';
+	print '<textarea name="address" wrap="soft" cols="40" rows="'.ROWS_3.'">'.$don->address.'</textarea></td></tr>';
 
     // Zip / Town
     print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
@@ -485,7 +485,7 @@ if (! empty($id) && $action != 'edit')
 	print "<tr>".'<td>'.$langs->trans("Company").'</td><td>'.$don->societe.'</td></tr>';
 	print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td>'.$don->prenom.'</td></tr>';
 	print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td>'.$don->nom.'</td></tr>';
-	print "<tr>".'<td>'.$langs->trans("Address").'</td><td>'.dol_nl2br($don->adresse).'</td></tr>';
+	print "<tr>".'<td>'.$langs->trans("Address").'</td><td>'.dol_nl2br($don->address).'</td></tr>';
 
 	// Zip / Town
 	print "<tr>".'<td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>'.$don->cp.($don->cp && $don->ville?' / ':'').$don->ville.'</td></tr>';
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index 47aa150dc4d..cf71f536593 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -144,7 +144,7 @@ class html_cerfafr extends ModeleDon
 		        $form = str_replace('__MAIN_INFO_SOCIETE_CP__',$mysoc->zip,$form);
 		        $form = str_replace('__MAIN_INFO_SOCIETE_VILLE__',$mysoc->town,$form);
 		        $form = str_replace('__DONATOR_NAME__',$don->nom,$form);
-		        $form = str_replace('__DONATOR_ADDRESS__',$don->adresse,$form);
+		        $form = str_replace('__DONATOR_ADDRESS__',$don->address,$form);
 		        $form = str_replace('__DONATOR_ZIP__',$don->cp,$form);
 		        $form = str_replace('__DONATOR_TOWN__',$don->ville,$form);
 		        $form = str_replace('__PAYMENTMODE_LIB__ ', $paymentmode,$form);
diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql
index 60f977e886d..d23d112ee1b 100644
--- a/htdocs/install/mysql/tables/llx_don.sql
+++ b/htdocs/install/mysql/tables/llx_don.sql
@@ -33,7 +33,7 @@ create table llx_don
   prenom          varchar(50),
   nom             varchar(50),
   societe         varchar(50),
-  adresse         text,
+  address         text,
   cp              varchar(30),
   ville           varchar(50),
   pays            varchar(50),

From 785e72d5339077aeb43bb36629dd9fe26bdf6fea Mon Sep 17 00:00:00 2001
From: Grand Philippe <contact@atoo-net.com>
Date: Fri, 15 Feb 2013 19:36:09 +0100
Subject: [PATCH 119/162] fix trad : change adresse versus address

---
 htdocs/comm/propal/class/propal.class.php  | 10 +++++-----
 htdocs/install/mysql/tables/llx_propal.sql |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 90ba3f93690..230e696bf10 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -90,7 +90,7 @@ class Propal extends CommonObject
     var $fk_delivery_address;		// deprecated (for compatibility)
     var $fk_address;
     var $address_type;
-    var $adresse;
+    var $address;
     var $availability_id;
     var $availability_code;
     var $demand_reason_id;
@@ -789,7 +789,7 @@ class Propal extends CommonObject
                 if (! $error && $this->fk_delivery_address)
                 {
                     $sql = "UPDATE ".MAIN_DB_PREFIX."propal";
-                    $sql.= " SET fk_adresse_livraison = ".$this->fk_delivery_address;
+                    $sql.= " SET fk_delivery_address = ".$this->fk_delivery_address;
                     $sql.= " WHERE ref = '".$this->ref."'";
                     $sql.= " AND entity = ".$conf->entity;
 
@@ -985,7 +985,7 @@ class Propal extends CommonObject
         $sql.= ", p.note as note_private, p.note_public";
         $sql.= ", p.fk_projet, p.fk_statut";
         $sql.= ", p.fk_user_author, p.fk_user_valid, p.fk_user_cloture";
-        $sql.= ", p.fk_adresse_livraison";
+        $sql.= ", p.fk_delivery_address";
         $sql.= ", p.fk_availability";
         $sql.= ", p.fk_input_reason";
         $sql.= ", p.fk_cond_reglement";
@@ -1049,8 +1049,8 @@ class Propal extends CommonObject
                 $this->demand_reason_id     = $obj->fk_input_reason;
                 $this->demand_reason_code   = $obj->demand_reason_code;
                 $this->demand_reason        = $obj->demand_reason;
-                $this->fk_delivery_address  = $obj->fk_adresse_livraison;	// TODO obsolete
-                $this->fk_address  			= $obj->fk_adresse_livraison;
+                //$this->fk_delivery_address  = $obj->fk_adresse_livraison;	// TODO obsolete
+                $this->fk_address  			= $obj->fk_delivery_address;
 
                 $this->mode_reglement_id    = $obj->fk_mode_reglement;
                 $this->mode_reglement_code  = $obj->mode_reglement_code;
diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql
index 9c4a440c23b..2964e768e47 100644
--- a/htdocs/install/mysql/tables/llx_propal.sql
+++ b/htdocs/install/mysql/tables/llx_propal.sql
@@ -65,6 +65,6 @@ create table llx_propal
   fk_input_reason		integer,
   import_key			varchar(14),
   extraparams			varchar(255),					-- for stock other parameters with json format
-  fk_adresse_livraison	integer							-- delivery address (deprecated)
+  fk_delivery_address	integer							-- delivery address (deprecated)
   
 )ENGINE=innodb;

From ab2b06117bc390d3215011ba406e5cd46ebba2f9 Mon Sep 17 00:00:00 2001
From: Grand Philippe <contact@atoo-net.com>
Date: Fri, 15 Feb 2013 19:56:51 +0100
Subject: [PATCH 120/162] fix trad : change adresse versus address

---
 htdocs/contact/class/contact.class.php       | 2 +-
 htdocs/core/class/CMailFile.class.php        | 6 +++---
 htdocs/core/class/commonobject.class.php     | 2 +-
 htdocs/expedition/class/expedition.class.php | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 14c8630e1e5..411de5d5fcd 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -520,7 +520,7 @@ class Contact extends CommonObject
 				$this->prenom			= $obj->firstname;		// TODO deprecated
 
 				$this->address			= $obj->address;
-				$this->adresse			= $obj->address; 		// TODO deprecated
+				//$this->adresse			= $obj->address; 		// TODO deprecated
 				$this->cp				= $obj->zip;			// TODO deprecated
 				$this->zip				= $obj->zip;
 				$this->ville			= $obj->town;			// TODO deprecated
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 9165b082679..a9337c87b8b 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -1020,7 +1020,7 @@ class CMailFile
 	/**
 	 * Return an address for SMTP protocol
 	 *
-	 * @param	string		$adresses		Example: 'John Doe <john@doe.com>' or 'john@doe.com'
+	 * @param	string		$address		Example: 'John Doe <john@doe.com>' or 'john@doe.com'
 	 * @param	int			$format			0=auto, 1=emails with <>, 2=emails without <>, 3=auto + label between "
 	 * @param	int			$encode			1=Encode name to RFC2822
 	 * @return	string						If format 0: '<john@doe.com>' or 'John Doe <john@doe.com>' or '=?UTF-8?B?Sm9obiBEb2U=?= <john@doe.com>'
@@ -1028,13 +1028,13 @@ class CMailFile
 	 *										If format 2: 'john@doe.com'
 	 *										If format 3: '<john@doe.com>' or '"John Doe" <john@doe.com>' or '"=?UTF-8?B?Sm9obiBEb2U=?=" <john@doe.com>'
 	 */
-	function getValidAddress($adresses,$format,$encode='')
+	function getValidAddress($address,$format,$encode='')
 	{
 		global $conf;
 
 		$ret='';
 
-		$arrayaddress=explode(',',$adresses);
+		$arrayaddress=explode(',',$address);
 
 		// Boucle sur chaque composant de l'adresse
 		foreach($arrayaddress as $val)
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 5d6d869ad81..8184e186999 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -964,7 +964,7 @@ abstract class CommonObject
      */
     function setDeliveryAddress($id)
     {
-    	$fieldname = 'fk_adresse_livraison';
+    	$fieldname = 'fk_delivery_address';
     	if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';
 
     	$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id;
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 7c9a5917727..1f890d2da3d 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -675,7 +675,7 @@ class Expedition extends CommonObject
 		if (isset($this->socid)) $this->socid=trim($this->socid);
 		if (isset($this->fk_user_author)) $this->fk_user_author=trim($this->fk_user_author);
 		if (isset($this->fk_user_valid)) $this->fk_user_valid=trim($this->fk_user_valid);
-		if (isset($this->fk_adresse_livraison)) $this->fk_adresse_livraison=trim($this->fk_adresse_livraison);
+		if (isset($this->fk_delivery_address)) $this->fk_delivery_address=trim($this->fk_delivery_address);
 		if (isset($this->expedition_method_id)) $this->expedition_method_id=trim($this->expedition_method_id);
 		if (isset($this->tracking_number)) $this->tracking_number=trim($this->tracking_number);
 		if (isset($this->statut)) $this->statut=trim($this->statut);
@@ -706,7 +706,7 @@ class Expedition extends CommonObject
 		$sql.= " fk_user_valid=".(isset($this->fk_user_valid)?$this->fk_user_valid:"null").",";
 		$sql.= " date_expedition=".(dol_strlen($this->date_expedition)!=0 ? "'".$this->db->idate($this->date_expedition)."'" : 'null').",";
 		$sql.= " date_delivery=".(dol_strlen($this->date_delivery)!=0 ? "'".$this->db->idate($this->date_delivery)."'" : 'null').",";
-		$sql.= " fk_address=".(isset($this->fk_adresse_livraison)?$this->fk_adresse_livraison:"null").",";
+		$sql.= " fk_address=".(isset($this->fk_delivery_address)?$this->fk_delivery_address:"null").",";
 		$sql.= " fk_expedition_methode=".((isset($this->expedition_method_id) && $this->expedition_method_id > 0)?$this->expedition_method_id:"null").",";
 		$sql.= " tracking_number=".(isset($this->tracking_number)?"'".$this->db->escape($this->tracking_number)."'":"null").",";
 		$sql.= " fk_statut=".(isset($this->statut)?$this->statut:"null").",";

From fa53147d0a529875b9963d465172ad382c94abba Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@aternatik.fr>
Date: Sat, 16 Feb 2013 03:41:11 +0100
Subject: [PATCH 121/162] Retrieve extrafields when fetch thirparty Work on
 extrafields support in thirpdparty ODT document

---
 htdocs/core/class/commondocgenerator.class.php | 13 ++++++++++++-
 htdocs/societe/class/societe.class.php         | 14 ++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 8c8d79f7422..ec9ae1d2870 100755
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -134,7 +134,7 @@ abstract class CommonDocGenerator
         	$object->state=getState($object->state_code,0);
         }
 
-        return array(
+        $array_thirdparty = array(
             'company_name'=>$object->name,
             'company_email'=>$object->email,
             'company_phone'=>$object->phone,
@@ -163,6 +163,17 @@ abstract class CommonDocGenerator
             'company_idprof6'=>$object->idprof6,
         	'company_note'=>$object->note
         );
+
+        $extrafields = array();
+        if(is_array($object->array_options) && count($object->array_options))
+        {
+        	foreach($object->array_options as $key=>$label)
+        	{
+        		$extrafields['company_options_'.$key] = $label;
+        	}
+        	$array_thirdparty = array_merge($array_thirdparty,$extrafields);
+        }
+        return $array_thirdparty;
     }
 
 	/**
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 0f5e7051010..28b38702fb9 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -139,6 +139,8 @@ class Societe extends CommonObject
     var $logo;
     var $logo_small;
     var $logo_mini;
+    
+    var $array_options;
 
     var $oldcopy;
 
@@ -852,6 +854,18 @@ class Societe extends CommonObject
                 $this->import_key = $obj->import_key;
 
                 $result = 1;
+                
+                // Retreive all extrafield for thirdparty
+                // fetch optionals attributes and labels
+                $extrafields=new ExtraFields($this->db);
+                $extralabels=$extrafields->fetch_name_optionals_label('company',true);
+                if (count($extralabels)>0) {
+                	$this->array_options = array();
+                }
+                foreach($extrafields->attribute_label as $key=>$label)
+                {                	
+                	$this->array_options[$key]=$label;
+                }
             }
             else
             {

From 4f5b636cc74cee609eccd7b3d7452ffc9355934b Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@aternatik.fr>
Date: Sat, 16 Feb 2013 13:58:21 +0100
Subject: [PATCH 122/162] Fix : missing class file

---
 htdocs/societe/class/societe.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 28b38702fb9..dfeec3eaab7 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -857,6 +857,7 @@ class Societe extends CommonObject
                 
                 // Retreive all extrafield for thirdparty
                 // fetch optionals attributes and labels
+                require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
                 $extrafields=new ExtraFields($this->db);
                 $extralabels=$extrafields->fetch_name_optionals_label('company',true);
                 if (count($extralabels)>0) {

From 50decdd941cb1e81788dd4c91b713f49492360fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 16 Feb 2013 21:06:15 +0100
Subject: [PATCH 123/162] Fix: When creating user on other entity, no way to
 read user after creation.

---
 htdocs/core/class/html.form.class.php | 26 +++++------
 htdocs/user/class/user.class.php      |  6 +--
 htdocs/user/fiche.php                 | 65 +++++++++++++++------------
 3 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index dcf70443fd8..2d46eec81dc 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -689,7 +689,7 @@ class Form
             {
                 //$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT)?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:2);
                 $out.= ajax_combobox($htmlname, $event, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
-				/*              
+				/*
 				if ($selected && empty($selected_input_value))
                 {
                 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -876,7 +876,7 @@ class Form
         if ($resql)
         {
             $num=$this->db->num_rows($resql);
-            
+
             if ($conf->use_javascript_ajax && $conf->global->CONTACT_USE_SEARCH_TO_SELECT && ! $forcecombo)
             {
             	$out.= ajax_combobox($htmlname, $event);
@@ -968,10 +968,10 @@ class Form
      * 	@param	int		$disabled		If select list must be disabled
      *  @param  array	$include        Array list of users id to include
      * 	@param	int		$enableonly		Array list of users id to be enabled. All other must be disabled
-     *  @param	int		$force_entity	Possibility to force entity
+     *  @param	int		$force_entity	0 or Id of environment to force
      * 	@return	void
      */
-    function select_users($selected='',$htmlname='userid',$show_empty=0,$exclude='',$disabled=0,$include='',$enableonly='',$force_entity=false)
+    function select_users($selected='',$htmlname='userid',$show_empty=0,$exclude='',$disabled=0,$include='',$enableonly='',$force_entity=0)
     {
         print $this->select_dolusers($selected,$htmlname,$show_empty,$exclude,$disabled,$include,$enableonly,$force_entity);
     }
@@ -986,10 +986,10 @@ class Form
      * 	@param	int		$disabled		If select list must be disabled
      *  @param  array	$include        Array list of users id to include
      * 	@param	int		$enableonly		Array list of users id to be enabled. All other must be disabled
-     *  @param	int		$force_entity	Possibility to force entity
+     *  @param	int		$force_entity	0 or Id of environment to force
      * 	@return	string					HTML select string
      */
-    function select_dolusers($selected='',$htmlname='userid',$show_empty=0,$exclude='',$disabled=0,$include='',$enableonly='',$force_entity=false)
+    function select_dolusers($selected='',$htmlname='userid',$show_empty=0,$exclude='',$disabled=0,$include='',$enableonly='',$force_entity=0)
     {
         global $conf,$user,$langs;
 
@@ -3946,17 +3946,17 @@ class Form
     /**
      *	Return select list of groups
      *
-     *  @param	string	$selected        Id group preselected
-     *  @param  string	$htmlname        Field name in form
-     *  @param  int		$show_empty      0=liste sans valeur nulle, 1=ajoute valeur inconnue
-     *  @param  string	$exclude         Array list of groups id to exclude
+     *  @param	string	$selected       Id group preselected
+     *  @param  string	$htmlname       Field name in form
+     *  @param  int		$show_empty     0=liste sans valeur nulle, 1=ajoute valeur inconnue
+     *  @param  string	$exclude        Array list of groups id to exclude
      * 	@param	int		$disabled		If select list must be disabled
-     *  @param  string	$include         Array list of groups id to include
+     *  @param  string	$include        Array list of groups id to include
      * 	@param	int		$enableonly		Array list of groups id to be enabled. All other must be disabled
-     * 	@param	int		$force_entity	Possibility to force entity
+     * 	@param	int		$force_entity	0 or Id of environment to force
      *  @return	void
      */
-    function select_dolgroups($selected='', $htmlname='groupid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity='')
+    function select_dolgroups($selected='', $htmlname='groupid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity=0)
     {
         global $conf,$user,$langs;
 
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 6b144c79a08..59641c1bbc1 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -154,13 +154,13 @@ class User extends CommonObject
 		$sql.= " u.ref_int, u.ref_ext";
 		$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
 
-		if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))
+		if ((empty($conf->multicompany->enabled) || empty($conf->multicompany->transverse_mode)) && (! empty($user->entity)))
 		{
-			$sql.= " WHERE u.entity IS NOT NULL";
+			$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
 		}
 		else
 		{
-			$sql.= " WHERE u.entity IN (0,".$conf->entity.")";
+			$sql.= " WHERE u.entity IS NOT NULL";
 		}
 
 		if ($sid)    // permet une recherche du user par son SID ActiveDirectory ou Samba
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 7988b68dfd2..4da27c64a55 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -819,21 +819,6 @@ if (($action == 'create') || ($action == 'adduserldap'))
         print "</td></tr>\n";
     }
 
-    //Multicompany
-    if (! empty($conf->multicompany->enabled))
-    {
-        if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
-        {
-            print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>';
-            print "<td>".$mc->select_entities($conf->entity);
-            print "</td></tr>\n";
-        }
-        else
-        {
-            print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
-        }
-    }
-
     // Type
     print '<tr><td valign="top">'.$langs->trans("Type").'</td>';
     print '<td>';
@@ -902,6 +887,28 @@ if (($action == 'create') || ($action == 'adduserldap'))
     print '<textarea rows="'.ROWS_5.'" cols="90" name="signature">'.GETPOST('signature').'</textarea>';
     print '</td></tr>';
 
+    // Multicompany
+    if (! empty($conf->multicompany->enabled))
+    {
+        if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
+        {
+            print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>';
+            print "<td>".$mc->select_entities($conf->entity);
+            print "</td></tr>\n";
+        }
+        else
+        {
+            print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
+        }
+    }
+
+    // Hierarchy
+    print '<tr><td valign="top">'.$langs->trans("HierarchicalResponsible").'</td>';
+    print '<td>';
+    print $form->select_dolusers($object->fk_user,'fk_user',1,array($object->id),0,'',0,$conf->entity);
+    print '</td>';
+    print "</tr>\n";
+
     // Note
     print '<tr><td valign="top">';
     print $langs->trans("Note");
@@ -941,7 +948,7 @@ else
     /*                                                                            */
     /* ************************************************************************** */
 
-    if ($id)
+    if ($id > 0)
     {
         $object->fetch($id);
         if ($res < 0) { dol_print_error($db,$object->error); exit; }
@@ -1051,7 +1058,7 @@ else
         if ($action != 'edit')
         {
             $rowspan=16;
-        	
+
             print '<table class="border" width="100%">';
 
             // Ref
@@ -1188,7 +1195,7 @@ else
             print '<tr><td valign="top">'.$langs->trans('Signature').'</td><td>';
             print dol_textishtml($object->signature)?$object->signature:dol_nl2br($object->signature,1,false);
             print "</td></tr>\n";
-            
+
             // Hierarchy
             print '<tr><td valign="top">'.$langs->trans("HierarchicalResponsible").'</td>';
             print '<td>';
@@ -1200,8 +1207,8 @@ else
             }
             print '</td>';
             print "</tr>\n";
-            
-            // Statut
+
+            // Status
             print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
             print '<td>';
             print $object->getLibStatut(4);
@@ -1223,7 +1230,7 @@ else
                 print '<td>'.$object->openid.'</td>';
                 print "</tr>\n";
             }
-            
+
             // Company / Contact
             if (! empty($conf->societe->enabled))
             {
@@ -1287,7 +1294,7 @@ else
             	}
             	print "</td></tr>\n";
             }
-            
+
           	// Other attributes
 			$parameters=array('colspan' => ' colspan="2"');
 			$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
@@ -1315,7 +1322,7 @@ else
 
             print '<div class="tabsAction">';
 
-            if ($caneditfield && ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            if ($caneditfield && (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
                 {
@@ -1327,7 +1334,7 @@ else
                 }
             }
             elseif ($caneditpassword && ! $object->ldap_sid &&
-            ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
+            (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->multicompany->transverse_mode && $conf->entity == 1)))
             {
                 print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("EditPassword").'</a>';
             }
@@ -1787,7 +1794,7 @@ else
             print '<td>';
             print '<textarea name="signature" rows="5" cols="90">'.dol_htmlentitiesbr_decode($object->signature).'</textarea>';
             print '</td></tr>';
-            
+
             // openid
             if (isset($conf->authmode) && preg_match('/myopenid/',$conf->authmode))
             {
@@ -1808,16 +1815,16 @@ else
             // Hierarchy
             print '<tr><td valign="top">'.$langs->trans("HierarchicalResponsible").'</td>';
             print '<td>';
-            print $form->select_dolusers($object->fk_user,'fk_user',1,array($object->id));
+            print $form->select_dolusers($object->fk_user,'fk_user',1,array($object->id),0,'',0,$object->entity);
             print '</td>';
             print "</tr>\n";
 
-            // Statut
+            // Status
             print '<tr><td valign="top">'.$langs->trans("Status").'</td>';
             print '<td>';
             print $object->getLibStatut(4);
             print '</td></tr>';
-            
+
             // Multicompany
             if (! empty($conf->multicompany->enabled))
             {
@@ -1832,7 +1839,7 @@ else
             		print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
             	}
             }
-            
+
             // Company / Contact
             if (! empty($conf->societe->enabled))
             {

From aff919fd10f5cb411139ae044344db6741c1da38 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Feb 2013 12:45:46 +0100
Subject: [PATCH 124/162] Fix: Bad test

---
 htdocs/product/class/product.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index a9c0439b220..49f1d495cde 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2187,10 +2187,10 @@ class Product extends CommonObject
 				$this->res[]= array($compl_path.$nom_pere,$desc_pere);
 			}
 
-			// Recursive call
-			if (is_array($desc_pere))
+			// Recursive call if child is an array
+			if (is_array($desc_pere[0]))
 			{
-				$this ->fetch_prod_arbo($desc_pere, $nom_pere." -> ", $desc_pere[1]*$multiply, $level+1);
+				$this ->fetch_prod_arbo($desc_pere[0], $nom_pere." -> ", $desc_pere[1]*$multiply, $level+1);
 			}
 		}
 	}

From aa8413d7cb907a0e547ecfb85cfa52e0d840b42b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Feb 2013 16:20:49 +0100
Subject: [PATCH 125/162] Fix: Missing migration Fix: Error management

---
 htdocs/comm/propal.php                         | 4 ++--
 htdocs/install/mysql/migration/3.3.0-3.4.0.sql | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index cc34443a622..90c37aaaa6f 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -79,12 +79,12 @@ $result = restrictedArea($user, 'propal', $id);
 
 $object = new Propal($db);
 
-// Load object
 // Load object
 if ($id > 0 || ! empty($ref))
 {
 	$ret=$object->fetch($id, $ref);
-	$ret=$object->fetch_thirdparty();
+	if ($ret > 0) $ret=$object->fetch_thirdparty();
+	if ($ret < 0) dol_print_error('',$object->error);
 }
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
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 1c17efb697c..a58eb45f1ba 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
@@ -39,3 +39,9 @@ alter table llx_contratdet add column buy_price_ht double(24,8) DEFAULT 0 after
 
 -- serialised array, to store value of select list choices for example
 alter table llx_extrafields add column param text DEFAULT '' after pos;
+
+
+alter table llx_propal   CHANGE COLUMN fk_adresse_livraison fk_delivery_address integer;
+alter table llx_commande CHANGE COLUMN fk_adresse_livraison fk_delivery_address integer;
+alter table llx_don      CHANGE COLUMN adresse address text;
+

From 9f8ffe242aa1b0fbc5feb549f2331e261f70dce6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Feb 2013 16:26:06 +0100
Subject: [PATCH 126/162] Fix: A text field can not have a default value

---
 htdocs/install/mysql/migration/3.3.0-3.4.0.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a58eb45f1ba..f7fe723b9b6 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
@@ -38,7 +38,7 @@ alter table llx_contratdet add column fk_product_fournisseur_price integer after
 alter table llx_contratdet add column buy_price_ht double(24,8) DEFAULT 0 after fk_product_fournisseur_price;
 
 -- serialised array, to store value of select list choices for example
-alter table llx_extrafields add column param text DEFAULT '' after pos;
+alter table llx_extrafields add column param text after pos;
 
 
 alter table llx_propal   CHANGE COLUMN fk_adresse_livraison fk_delivery_address integer;

From e56e182fe90c52abf513c3fc0ba84bf3cffaf485 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Feb 2013 16:37:28 +0100
Subject: [PATCH 127/162] Fix: When creating invoice from other object, type
 must be "standard".

---
 htdocs/compta/facture.php | 111 +++++++++++++++++++-------------------
 1 file changed, 57 insertions(+), 54 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index bccac8d8354..7c42593f70b 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1915,14 +1915,6 @@ if ($action == 'create')
     print $desc;
     print '</td></tr>'."\n";
 
-    // Deposit
-    print '<tr height="18"><td width="16px" valign="middle">';
-    print '<input type="radio" name="type" value="3"'.(GETPOST('type')==3?' checked="checked"':'').'>';
-    print '</td><td valign="middle">';
-    $desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
-    print $desc;
-    print '</td></tr>'."\n";
-
     // Proforma
     if (! empty($conf->global->FACTURE_USE_PROFORMAT))
     {
@@ -1934,56 +1926,67 @@ if ($action == 'create')
         print '</td></tr>'."\n";
     }
 
-	if ($socid>0)
-	{
-	    // Replacement
-	    print '<tr height="18"><td valign="middle">';
-	    print '<input type="radio" name="type" value="1"'.(GETPOST('type')==1?' checked="checked"':'');
-	    if (! $options) print ' disabled="disabled"';
-	    print '>';
+    if (empty($origin))
+    {
+	    // Deposit
+	    print '<tr height="18"><td width="16px" valign="middle">';
+	    print '<input type="radio" name="type" value="3"'.(GETPOST('type')==3?' checked="checked"':'').'>';
 	    print '</td><td valign="middle">';
-	    $text=$langs->trans("InvoiceReplacementAsk").' ';
-	    $text.='<select class="flat" name="fac_replacement" id="fac_replacement"';
-	    if (! $options) $text.=' disabled="disabled"';
-	    $text.='>';
-	    if ($options)
-	    {
-	        $text.='<option value="-1"></option>';
-	        $text.=$options;
-	    }
-	    else
-	    {
-	        $text.='<option value="-1">'.$langs->trans("NoReplacableInvoice").'</option>';
-	    }
-	    $text.='</select>';
-	    $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1);
+	    $desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
 	    print $desc;
 	    print '</td></tr>'."\n";
 
-	    // Credit note
-	    print '<tr height="18"><td valign="middle">';
-	    print '<input type="radio" name="type" value="2"'.(GETPOST('type')==2?' checked=true':'');
-	    if (! $optionsav) print ' disabled="disabled"';
-	    print '>';
-	    print '</td><td valign="middle">';
-	    $text=$langs->transnoentities("InvoiceAvoirAsk").' ';
-	    //	$text.='<input type="text" value="">';
-	    $text.='<select class="flat" name="fac_avoir" id="fac_avoir"';
-	    if (! $optionsav) $text.=' disabled="disabled"';
-	    $text.='>';
-	    if ($optionsav)
-	    {
-	        $text.='<option value="-1"></option>';
-	        $text.=$optionsav;
-	    }
-	    else
-	    {
-	        $text.='<option value="-1">'.$langs->trans("NoInvoiceToCorrect").'</option>';
-	    }
-	    $text.='</select>';
-	    $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceAvoirDesc"),1);
-	    print $desc;
-	    print '</td></tr>'."\n";
+    	if ($socid > 0)
+		{
+		    // Replacement
+		    print '<tr height="18"><td valign="middle">';
+		    print '<input type="radio" name="type" value="1"'.(GETPOST('type')==1?' checked="checked"':'');
+		    if (! $options) print ' disabled="disabled"';
+		    print '>';
+		    print '</td><td valign="middle">';
+		    $text=$langs->trans("InvoiceReplacementAsk").' ';
+		    $text.='<select class="flat" name="fac_replacement" id="fac_replacement"';
+		    if (! $options) $text.=' disabled="disabled"';
+		    $text.='>';
+		    if ($options)
+		    {
+		        $text.='<option value="-1"></option>';
+		        $text.=$options;
+		    }
+		    else
+		    {
+		        $text.='<option value="-1">'.$langs->trans("NoReplacableInvoice").'</option>';
+		    }
+		    $text.='</select>';
+		    $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1);
+		    print $desc;
+		    print '</td></tr>'."\n";
+
+		    // Credit note
+		    print '<tr height="18"><td valign="middle">';
+		    print '<input type="radio" name="type" value="2"'.(GETPOST('type')==2?' checked=true':'');
+		    if (! $optionsav) print ' disabled="disabled"';
+		    print '>';
+		    print '</td><td valign="middle">';
+		    $text=$langs->transnoentities("InvoiceAvoirAsk").' ';
+		    //	$text.='<input type="text" value="">';
+		    $text.='<select class="flat" name="fac_avoir" id="fac_avoir"';
+		    if (! $optionsav) $text.=' disabled="disabled"';
+		    $text.='>';
+		    if ($optionsav)
+		    {
+		        $text.='<option value="-1"></option>';
+		        $text.=$optionsav;
+		    }
+		    else
+		    {
+		        $text.='<option value="-1">'.$langs->trans("NoInvoiceToCorrect").'</option>';
+		    }
+		    $text.='</select>';
+		    $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceAvoirDesc"),1);
+		    print $desc;
+		    print '</td></tr>'."\n";
+		}
 	}
 	print '</table>';
 	print '</td></tr>';

From d2074d1a176c3ca57ce9480e89a1bb482c9a7c4b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Feb 2013 17:06:55 +0100
Subject: [PATCH 128/162] Fix: When creating invoice from other object, type
 must be standard only

---
 htdocs/compta/facture.php | 109 ++++++++++++++++++++------------------
 1 file changed, 56 insertions(+), 53 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 86f03b2d040..0d46ca1efcd 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1899,14 +1899,6 @@ if ($action == 'create')
     print $desc;
     print '</td></tr>'."\n";
 
-    // Deposit
-    print '<tr height="18"><td width="16px" valign="middle">';
-    print '<input type="radio" name="type" value="3"'.(GETPOST('type')==3?' checked="checked"':'').'>';
-    print '</td><td valign="middle">';
-    $desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
-    print $desc;
-    print '</td></tr>'."\n";
-
     // Proforma
     if (! empty($conf->global->FACTURE_USE_PROFORMAT))
     {
@@ -1918,54 +1910,65 @@ if ($action == 'create')
         print '</td></tr>'."\n";
     }
 
-    // Replacement
-    print '<tr height="18"><td valign="middle">';
-    print '<input type="radio" name="type" value="1"'.(GETPOST('type')==1?' checked="checked"':'');
-    if (! $options) print ' disabled="disabled"';
-    print '>';
-    print '</td><td valign="middle">';
-    $text=$langs->trans("InvoiceReplacementAsk").' ';
-    $text.='<select class="flat" name="fac_replacement" id="fac_replacement"';
-    if (! $options) $text.=' disabled="disabled"';
-    $text.='>';
-    if ($options)
+    if (empty($origin))
     {
-        $text.='<option value="-1"></option>';
-        $text.=$options;
-    }
-    else
-    {
-        $text.='<option value="-1">'.$langs->trans("NoReplacableInvoice").'</option>';
-    }
-    $text.='</select>';
-    $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1);
-    print $desc;
-    print '</td></tr>'."\n";
+	    // Deposit
+	    print '<tr height="18"><td width="16px" valign="middle">';
+	    print '<input type="radio" name="type" value="3"'.(GETPOST('type')==3?' checked="checked"':'').'>';
+	    print '</td><td valign="middle">';
+	    $desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
+	    print $desc;
+	    print '</td></tr>'."\n";
 
-    // Credit note
-    print '<tr height="18"><td valign="middle">';
-    print '<input type="radio" name="type" value="2"'.(GETPOST('type')==2?' checked=true':'');
-    if (! $optionsav) print ' disabled="disabled"';
-    print '>';
-    print '</td><td valign="middle">';
-    $text=$langs->transnoentities("InvoiceAvoirAsk").' ';
-    //	$text.='<input type="text" value="">';
-    $text.='<select class="flat" name="fac_avoir" id="fac_avoir"';
-    if (! $optionsav) $text.=' disabled="disabled"';
-    $text.='>';
-    if ($optionsav)
-    {
-        $text.='<option value="-1"></option>';
-        $text.=$optionsav;
+	    // Replacement
+	    print '<tr height="18"><td valign="middle">';
+	    print '<input type="radio" name="type" value="1"'.(GETPOST('type')==1?' checked="checked"':'');
+	    if (! $options) print ' disabled="disabled"';
+	    print '>';
+	    print '</td><td valign="middle">';
+	    $text=$langs->trans("InvoiceReplacementAsk").' ';
+	    $text.='<select class="flat" name="fac_replacement" id="fac_replacement"';
+	    if (! $options) $text.=' disabled="disabled"';
+	    $text.='>';
+	    if ($options)
+	    {
+	        $text.='<option value="-1"></option>';
+	        $text.=$options;
+	    }
+	    else
+	    {
+	        $text.='<option value="-1">'.$langs->trans("NoReplacableInvoice").'</option>';
+	    }
+	    $text.='</select>';
+	    $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1);
+	    print $desc;
+    	print '</td></tr>'."\n";
+
+	    // Credit note
+	    print '<tr height="18"><td valign="middle">';
+	    print '<input type="radio" name="type" value="2"'.(GETPOST('type')==2?' checked=true':'');
+	    if (! $optionsav) print ' disabled="disabled"';
+	    print '>';
+	    print '</td><td valign="middle">';
+	    $text=$langs->transnoentities("InvoiceAvoirAsk").' ';
+	    //	$text.='<input type="text" value="">';
+	    $text.='<select class="flat" name="fac_avoir" id="fac_avoir"';
+	    if (! $optionsav) $text.=' disabled="disabled"';
+	    $text.='>';
+	    if ($optionsav)
+	    {
+	        $text.='<option value="-1"></option>';
+	        $text.=$optionsav;
+	    }
+	    else
+	    {
+	        $text.='<option value="-1">'.$langs->trans("NoInvoiceToCorrect").'</option>';
+	    }
+	    $text.='</select>';
+	    $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceAvoirDesc"),1);
+	    print $desc;
+	    print '</td></tr>'."\n";
     }
-    else
-    {
-        $text.='<option value="-1">'.$langs->trans("NoInvoiceToCorrect").'</option>';
-    }
-    $text.='</select>';
-    $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceAvoirDesc"),1);
-    print $desc;
-    print '</td></tr>'."\n";
 
     print '</table>';
     print '</td></tr>';

From b434f58af3458744e4357c03e9b0db4c553b34c8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Feb 2013 17:12:06 +0100
Subject: [PATCH 129/162] Fix: When creating invoice from other object, type
 must be standard only

---
 htdocs/compta/facture.php | 51 +++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 0d46ca1efcd..5bc85030f99 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1919,32 +1919,35 @@ if ($action == 'create')
 	    $desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
 	    print $desc;
 	    print '</td></tr>'."\n";
+    }
 
-	    // Replacement
-	    print '<tr height="18"><td valign="middle">';
-	    print '<input type="radio" name="type" value="1"'.(GETPOST('type')==1?' checked="checked"':'');
-	    if (! $options) print ' disabled="disabled"';
-	    print '>';
-	    print '</td><td valign="middle">';
-	    $text=$langs->trans("InvoiceReplacementAsk").' ';
-	    $text.='<select class="flat" name="fac_replacement" id="fac_replacement"';
-	    if (! $options) $text.=' disabled="disabled"';
-	    $text.='>';
-	    if ($options)
-	    {
-	        $text.='<option value="-1"></option>';
-	        $text.=$options;
-	    }
-	    else
-	    {
-	        $text.='<option value="-1">'.$langs->trans("NoReplacableInvoice").'</option>';
-	    }
-	    $text.='</select>';
-	    $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1);
-	    print $desc;
-    	print '</td></tr>'."\n";
+    // Replacement
+    print '<tr height="18"><td valign="middle">';
+    print '<input type="radio" name="type" value="1"'.(GETPOST('type')==1?' checked="checked"':'');
+    if (! $options) print ' disabled="disabled"';
+    print '>';
+    print '</td><td valign="middle">';
+    $text=$langs->trans("InvoiceReplacementAsk").' ';
+    $text.='<select class="flat" name="fac_replacement" id="fac_replacement"';
+    if (! $options) $text.=' disabled="disabled"';
+    $text.='>';
+    if ($options)
+    {
+        $text.='<option value="-1"></option>';
+        $text.=$options;
+    }
+    else
+    {
+        $text.='<option value="-1">'.$langs->trans("NoReplacableInvoice").'</option>';
+    }
+    $text.='</select>';
+    $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1);
+    print $desc;
+   	print '</td></tr>'."\n";
 
-	    // Credit note
+    if (empty($origin))
+    {
+    	// Credit note
 	    print '<tr height="18"><td valign="middle">';
 	    print '<input type="radio" name="type" value="2"'.(GETPOST('type')==2?' checked=true':'');
 	    if (! $optionsav) print ' disabled="disabled"';

From 9a951e4d6d00fc749eeb96268d3621396734f809 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Feb 2013 17:12:19 +0100
Subject: [PATCH 130/162] Fix: When creating invoice from other object, type
 must be standard only

---
 htdocs/compta/facture.php | 105 ++++++++++++++++++++------------------
 1 file changed, 54 insertions(+), 51 deletions(-)

diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 7c42593f70b..49604013c19 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1935,63 +1935,66 @@ if ($action == 'create')
 	    $desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1);
 	    print $desc;
 	    print '</td></tr>'."\n";
+    }
 
-    	if ($socid > 0)
-		{
-		    // Replacement
-		    print '<tr height="18"><td valign="middle">';
-		    print '<input type="radio" name="type" value="1"'.(GETPOST('type')==1?' checked="checked"':'');
-		    if (! $options) print ' disabled="disabled"';
-		    print '>';
-		    print '</td><td valign="middle">';
-		    $text=$langs->trans("InvoiceReplacementAsk").' ';
-		    $text.='<select class="flat" name="fac_replacement" id="fac_replacement"';
-		    if (! $options) $text.=' disabled="disabled"';
-		    $text.='>';
-		    if ($options)
-		    {
-		        $text.='<option value="-1"></option>';
-		        $text.=$options;
-		    }
-		    else
-		    {
-		        $text.='<option value="-1">'.$langs->trans("NoReplacableInvoice").'</option>';
-		    }
-		    $text.='</select>';
-		    $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1);
-		    print $desc;
-		    print '</td></tr>'."\n";
+    if ($socid > 0)
+	{
+	    // Replacement
+	    print '<tr height="18"><td valign="middle">';
+	    print '<input type="radio" name="type" value="1"'.(GETPOST('type')==1?' checked="checked"':'');
+	    if (! $options) print ' disabled="disabled"';
+	    print '>';
+	    print '</td><td valign="middle">';
+	    $text=$langs->trans("InvoiceReplacementAsk").' ';
+	    $text.='<select class="flat" name="fac_replacement" id="fac_replacement"';
+	    if (! $options) $text.=' disabled="disabled"';
+	    $text.='>';
+	    if ($options)
+	    {
+	        $text.='<option value="-1"></option>';
+	        $text.=$options;
+	    }
+	    else
+	    {
+	        $text.='<option value="-1">'.$langs->trans("NoReplacableInvoice").'</option>';
+	    }
+	    $text.='</select>';
+	    $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceReplacementDesc"),1);
+	    print $desc;
+	    print '</td></tr>'."\n";
+	}
 
-		    // Credit note
-		    print '<tr height="18"><td valign="middle">';
-		    print '<input type="radio" name="type" value="2"'.(GETPOST('type')==2?' checked=true':'');
-		    if (! $optionsav) print ' disabled="disabled"';
-		    print '>';
-		    print '</td><td valign="middle">';
-		    $text=$langs->transnoentities("InvoiceAvoirAsk").' ';
-		    //	$text.='<input type="text" value="">';
-		    $text.='<select class="flat" name="fac_avoir" id="fac_avoir"';
-		    if (! $optionsav) $text.=' disabled="disabled"';
-		    $text.='>';
-		    if ($optionsav)
-		    {
-		        $text.='<option value="-1"></option>';
-		        $text.=$optionsav;
-		    }
-		    else
-		    {
-		        $text.='<option value="-1">'.$langs->trans("NoInvoiceToCorrect").'</option>';
-		    }
-		    $text.='</select>';
-		    $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceAvoirDesc"),1);
-		    print $desc;
-		    print '</td></tr>'."\n";
-		}
+	if (empty($origin) && $socid > 0)
+	{
+	    // Credit note
+	    print '<tr height="18"><td valign="middle">';
+	    print '<input type="radio" name="type" value="2"'.(GETPOST('type')==2?' checked=true':'');
+	    if (! $optionsav) print ' disabled="disabled"';
+	    print '>';
+	    print '</td><td valign="middle">';
+	    $text=$langs->transnoentities("InvoiceAvoirAsk").' ';
+	    //	$text.='<input type="text" value="">';
+	    $text.='<select class="flat" name="fac_avoir" id="fac_avoir"';
+	    if (! $optionsav) $text.=' disabled="disabled"';
+	    $text.='>';
+	    if ($optionsav)
+	    {
+	        $text.='<option value="-1"></option>';
+	        $text.=$optionsav;
+	    }
+	    else
+	    {
+	        $text.='<option value="-1">'.$langs->trans("NoInvoiceToCorrect").'</option>';
+	    }
+	    $text.='</select>';
+	    $desc=$form->textwithpicto($text,$langs->transnoentities("InvoiceAvoirDesc"),1);
+	    print $desc;
+	    print '</td></tr>'."\n";
 	}
 	print '</table>';
 	print '</td></tr>';
 
-	if($socid>0)
+	if ($socid > 0)
 	{
 		// Discounts for third party
 		print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="2">';

From df2fde3a68b747fe1df13a8bea848a3391dc4bc4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Feb 2013 17:17:19 +0100
Subject: [PATCH 131/162] Prepare 3.3 release

---
 build/exe/doliwamp/doliwamp.iss |  4 ++--
 build/makepack-dolibarr.pl      |  2 +-
 build/makepack-howto.txt        | 10 +++++-----
 build/pad/pad_dolibarr.xml      |  6 +++---
 build/pad/pad_doliwamp.xml      |  6 +++---
 htdocs/filefunc.inc.php         |  2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index 1dd37f24700..faafcf5ce6a 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -17,9 +17,9 @@
 ; ----- Change this -----
 AppName=DoliWamp
 ; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
-AppVerName=DoliWamp-3.3.0-beta
+AppVerName=DoliWamp-3.3.0
 ; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
-OutputBaseFilename=DoliWamp-3.3.0-beta
+OutputBaseFilename=DoliWamp-3.3.0
 ; Define full path from wich all relative path are defined
 ; You must modify this to put here your dolibarr root directory
 ;SourceDir=C:\Documents and Settings\ldestailleur\git\dolibarr_old
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 8fcf7946de7..aee377023ac 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -10,7 +10,7 @@ use Cwd;
 $PROJECT="dolibarr";
 $MAJOR="3";
 $MINOR="3";
-$BUILD="0-beta";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
+$BUILD="0";		# Mettre x pour release, x-dev pour dev, x-beta pour beta, x-rc pour release candidate
 $RPMSUBVERSION="auto";	# auto use value found into BUILD
 
 @LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT");   # Possible packages
diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt
index a8a9471cc1b..fad028cfbf6 100644
--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -33,11 +33,11 @@ complete release of Dolibarr, step by step.
 
 - Check all files are commited.
 - Update version/info in /ChangeLog and /filefunc.inc.php
-- Update version number with x.x.x-y in htdocs/filefunc.inc.php
-- Update version number with x.x.x-y in build/makepack-dolibarr.pl
-- Update version number with x.x.x-y in build/debian/changelog
-- Update version number with x.x.x-y in build/exe/doliwamp/doliwamp.iss
-- Update version number with x.x.x-y in build/rpm/*.spec
+- Update version number with x.x.x in htdocs/filefunc.inc.php
+- Update version number with x.x.x in build/makepack-dolibarr.pl
+- Update version number with x.x.x in build/debian/changelog
+- Update version number with x.x.x in build/exe/doliwamp/doliwamp.iss
+- Update version number with x.x.x in build/rpm/*.spec
 - Update PAD files.
 - Commit all changes.
 - Add a Tag (DOLIBARR_x_y)
diff --git a/build/pad/pad_dolibarr.xml b/build/pad/pad_dolibarr.xml
index e8c88ca8968..dd80e1ef53c 100644
--- a/build/pad/pad_dolibarr.xml
+++ b/build/pad/pad_dolibarr.xml
@@ -35,9 +35,9 @@
 	<Program_Info>
 		<Program_Name>Dolibarr</Program_Name>
 		<Program_Version>3.3.0</Program_Version>
-		<Program_Release_Month>08</Program_Release_Month>
-		<Program_Release_Day>10</Program_Release_Day>
-		<Program_Release_Year>2012</Program_Release_Year>
+		<Program_Release_Month>02</Program_Release_Month>
+		<Program_Release_Day>17</Program_Release_Day>
+		<Program_Release_Year>2013</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />
diff --git a/build/pad/pad_doliwamp.xml b/build/pad/pad_doliwamp.xml
index e20d9563559..148c4a4e79b 100644
--- a/build/pad/pad_doliwamp.xml
+++ b/build/pad/pad_doliwamp.xml
@@ -35,9 +35,9 @@
 	<Program_Info>
 		<Program_Name>DoliWamp</Program_Name>
 		<Program_Version>3.3.0</Program_Version>
-		<Program_Release_Month>08</Program_Release_Month>
-		<Program_Release_Day>10</Program_Release_Day>
-		<Program_Release_Year>2012</Program_Release_Year>
+		<Program_Release_Month>02</Program_Release_Month>
+		<Program_Release_Day>17</Program_Release_Day>
+		<Program_Release_Year>2013</Program_Release_Year>
 		<Program_Cost_Dollars />
 		<Program_Cost_Other_Code />
 		<Program_Cost_Other />
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 6173ef70704..734526bedc6 100755
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -29,7 +29,7 @@
  *  \brief      File that include conf.php file and commons lib like functions.lib.php
  */
 
-if (! defined('DOL_VERSION')) define('DOL_VERSION','3.3.0-beta');
+if (! defined('DOL_VERSION')) define('DOL_VERSION','3.3.0');
 if (! defined('EURO')) define('EURO',chr(128));
 
 // Define syslog constants

From b0695d3bbb64ab46380cbc585d1a7affe527e551 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Feb 2013 17:20:05 +0100
Subject: [PATCH 132/162] Preapre 3.3

---
 build/rpm/dolibarr_fedora.spec   | 2 +-
 build/rpm/dolibarr_generic.spec  | 2 +-
 build/rpm/dolibarr_mandriva.spec | 2 +-
 build/rpm/dolibarr_opensuse.spec | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index 3481164a0af..b894d8367d1 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -333,5 +333,5 @@ fi
 
 
 %changelog
-* Wed Dec 19 2012 Laurent Destailleur 3.3.0-0.1.a
+* Sun Feb 17 2013 Laurent Destailleur 3.3.0-0.3
 - Initial version (#723326)
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 8d8949f1f83..f2aa80cf0e3 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -522,5 +522,5 @@ fi
 
 
 %changelog
-* Wed Dec 19 2012 Laurent Destailleur 3.3.0-0.1.a
+* Sun Feb 17 2013 Laurent Destailleur 3.3.0-0.3
 - Initial version (#723326)
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 161bf9f7b0b..fa4e379e885 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -322,5 +322,5 @@ fi
 
 
 %changelog
-* Wed Dec 19 2012 Laurent Destailleur 3.3.0-0.1.a
+* Sun Feb 17 2013 Laurent Destailleur 3.3.0-0.3
 - Initial version (#723326)
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 170b4d28813..9eaf86f1d3d 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -333,5 +333,5 @@ fi
 
 
 %changelog
-* Wed Dec 19 2012 Laurent Destailleur 3.3.0-0.1.a
+* Sun Feb 17 2013 Laurent Destailleur 3.3.0-0.3
 - Initial version (#723326)

From 8af34ee97ea7c012be8c9dabfb9e52e48b4aacf5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Feb 2013 18:40:09 +0100
Subject: [PATCH 133/162] Fix: Bad property

---
 htdocs/expedition/class/expedition.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 1f890d2da3d..1840713b0e6 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -909,8 +909,8 @@ class Expedition extends CommonObject
 				$line->volume         	= $obj->volume;
 				$line->volume_units   	= $obj->volume_units;
 
-				//Invoicing
-				$line->desc				= $obj->product_label;
+				// For invoicing
+				$line->desc	         	= $obj->description;		// We need ->desc because some code into CommonObject use desc (property defined for other elements)
 				$line->qty 				= $obj->qty_shipped;
 				$line->total_ht			= $obj->total_ht;
 				$line->total_localtax1 	= $obj->total_localtax1;

From 660fd2e785da708d258a2bee2dcc7b639724399e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Feb 2013 18:46:46 +0100
Subject: [PATCH 134/162] Doc

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

diff --git a/ChangeLog b/ChangeLog
index 68452e0ca4f..7c1b893fc12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ For users:
 - New: Can attach files onto trip and expenses modules.
 - New: Add option MAIN_PDF_TITLE_BACKGROUND_COLOR
 - New: Can define a hierarchical responsible on user
+- New: Merge tab customer and prospect
 
 For developers:
 - System of menu managers has been rewritten to reduce code to do same things. 

From 2bad9c0d9a227662f77ca808bc2e6917c20e6e16 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Feb 2013 19:25:55 +0100
Subject: [PATCH 135/162] Fix: Nb of holidays was not using correct user

---
 htdocs/holiday/index.php        | 99 +++++++++++++++++++++++----------
 htdocs/langs/en_US/holiday.lang |  2 +-
 htdocs/langs/fr_FR/holiday.lang |  2 +-
 3 files changed, 71 insertions(+), 32 deletions(-)

diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php
index 19944b16ae8..16d2edddf7e 100644
--- a/htdocs/holiday/index.php
+++ b/htdocs/holiday/index.php
@@ -30,6 +30,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+
+$langs->load('users');
+$langs->load('holidays');
 
 // Protection if external user
 if ($user->societe_id > 0) accessforbidden();
@@ -46,6 +51,8 @@ $offset = $conf->liste_limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
+$id = GETPOST('id');
+
 $search_ref      = GETPOST('search_ref');
 $month_create    = GETPOST('month_create');
 $year_create     = GETPOST('year_create');
@@ -72,6 +79,7 @@ $search_statut   = GETPOST('select_statut');
 
 $holiday = new Holiday($db);
 $holidaystatic=new Holiday($db);
+$fuser = new User($db);
 
 // Update sold
 $holiday->updateSold();
@@ -151,28 +159,22 @@ if(!empty($search_statut) && $search_statut != -1) {
 // Récupération de l'ID de l'utilisateur
 $user_id = $user->id;
 
+if ($id > 0)
+{
+	// Charge utilisateur edite
+	$fuser->fetch($id);
+	$fuser->getrights();
+	$user_id = $fuser->id;
+}
 // Récupération des congés payés de l'utilisateur ou de tous les users
-if (!$user->rights->holiday->lire_tous)
+if (!$user->rights->holiday->lire_tous || $id > 0)
 {
-    $holiday_payes = $holiday->fetchByUser($user_id,$order,$filter);
+	$holiday_payes = $holiday->fetchByUser($user_id,$order,$filter);
 }
 else
 {
     $holiday_payes = $holiday->fetchAll($order,$filter);
 }
-
-// Si pas de congés payés
-if ($holiday_payes == 0)
-{
-    print_fiche_titre($langs->trans('CPTitreMenu'));
-
-    print '<div class="tabBar">';
-    print '<span>'.$langs->trans('NoCPforUser').'<br /><br />';
-    print '<a href="./fiche.php?mainmenu=agenda&action=request" class="butAction">'.$langs->trans('AddCP').'</a></span>';
-    print '</div>';
-    exit();
-}
-
 // Si erreur SQL
 if ($holiday_payes == '-1')
 {
@@ -189,14 +191,48 @@ if ($holiday_payes == '-1')
  * Affichage du tableau des congés payés
 *************************************/
 
-$var=true; $num = count($holiday->holiday);
-$html = new Form($db);
-$htmlother = new FormOther($db);
-print_barre_liste($langs->trans("ListeCP"), $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, "", $num);
+$var=true; $num = count($holiday->holiday);
+$form = new Form($db);
+$formother = new FormOther($db);
 
-print '<div class="tabBar">';
+if ($id > 0)
+{
+	$head = user_prepare_head($fuser);
+
+	$title = $langs->trans("User");
+	dol_fiche_head($head, 'paidholidays', $title, 0, 'user');
 
-$nbaquis=$holiday->getCPforUser($user->id);
+	print '<table class="border" width="100%">';
+
+	// Ref
+	print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>';
+	print '<td colspan="2">';
+	print $form->showrefnav($fuser,'id','',$user->rights->user->user->lire || $user->admin);
+	print '</td>';
+	print '</tr>';
+
+	// Nom
+	print '<tr><td width="25%" valign="top">'.$langs->trans("LastName").'</td>';
+	print '<td colspan="2">'.$fuser->lastname.'</td>';
+	print "</tr>\n";
+
+	// Prenom
+	print '<tr><td width="25%" valign="top">'.$langs->trans("FirstName").'</td>';
+	print '<td colspan="2">'.$fuser->firstname.'</td>';
+	print "</tr>\n";
+
+	print '</table><br>';
+
+}
+else
+{
+	print_barre_liste($langs->trans("ListeCP"), $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, "", $num);
+
+	print '<div class="tabBar">';
+}
+
+
+$nbaquis=$holiday->getCPforUser($user_id);
 $nbdeduced=$holiday->getConfCP('nbHolidayDeducted');
 $nb_holiday = $nbaquis / $nbdeduced;
 print $langs->trans('SoldeCPUser',round($nb_holiday,2)).($nbdeduced != 1 ? ' ('.$nbaquis.' / '.$nbdeduced.')' : '');
@@ -223,13 +259,13 @@ print '<input class="flat" size="4" type="text" name="search_ref" value="'.$sear
 // DATE CREATE
 print '<td class="liste_titre" colspan="1" align="center">';
 print '<input class="flat" type="text" size="1" maxlength="2" name="month_create" value="'.$month_create.'">';
-$htmlother->select_year($year_create,'year_create',1, $min_year, $max_year);
+$formother->select_year($year_create,'year_create',1, $min_year, $max_year);
 print '</td>';
 
 // UTILISATEUR
 if($user->rights->holiday->lire_tous) {
     print '<td class="liste_titre" align="left">';
-    $html->select_users($search_employe,"search_employe",1,"",0,'');
+    $form->select_users($search_employe,"search_employe",1,"",0,'');
     print '</td>';
 } else {
     print '<td class="liste_titre">&nbsp;</td>';
@@ -246,7 +282,7 @@ if($user->rights->holiday->lire_tous){
     $validator = new UserGroup($db,$idGroupValid);
     $valideur = $validator->listUsersForGroup();
 
-    $html->select_users($search_valideur,"search_valideur",1,"",0,$valideur,'');
+    $form->select_users($search_valideur,"search_valideur",1,"",0,$valideur,'');
     print '</td>';
 } else {
     print '<td class="liste_titre">&nbsp;</td>';
@@ -255,13 +291,13 @@ if($user->rights->holiday->lire_tous){
 // DATE DEBUT
 print '<td class="liste_titre" colspan="1" align="center">';
 print '<input class="flat" type="text" size="1" maxlength="2" name="month_start" value="'.$month_start.'">';
-$htmlother->select_year($year_start,'year_start',1, $min_year, $max_year);
+$formother->select_year($year_start,'year_start',1, $min_year, $max_year);
 print '</td>';
 
 // DATE FIN
 print '<td class="liste_titre" colspan="1" align="center">';
 print '<input class="flat" type="text" size="1" maxlength="2" name="month_end" value="'.$month_end.'">';
-$htmlother->select_year($year_end,'year_end',1, $min_year, $max_year);
+$formother->select_year($year_end,'year_end',1, $min_year, $max_year);
 print '</td>';
 
 // DUREE
@@ -327,10 +363,13 @@ if($holiday_payes == '2')
 print '</table>';
 print '</form>';
 
-print '<br>';
-print '<div style="float: right; margin-top: 8px;">';
-print '<a href="./fiche.php?action=request" class="butAction">'.$langs->trans('AddCP').'</a>';
-print '</div>';
+if ($user_id == $user->id)
+{
+	print '<br>';
+	print '<div style="float: right; margin-top: 8px;">';
+	print '<a href="./fiche.php?action=request" class="butAction">'.$langs->trans('AddCP').'</a>';
+	print '</div>';
+}
 
 llxFooter();
 
diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index 2b83b1fcb1d..abf2b1dc514 100755
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -26,7 +26,7 @@ SendRequestCP=Creating demand for holidays
 DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
 MenuConfCP=Edit balance of holidays
 UpdateAllCP=Update the holidays
-SoldeCPUser=Your balance of holidays is <b>%s</b> days.
+SoldeCPUser=Holidays balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index 60c7594fe90..ed8d339af75 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -26,7 +26,7 @@ SendRequestCP=Envoyer la demande de congés
 DelayToRequestCP=Les demandes de congés doivent être faites au moins <b>%s jours</b> avant la date</b> de ceux-ci.
 MenuConfCP=Mettre à jour solde
 UpdateAllCP=Mettre à jour les congés
-SoldeCPUser=Votre solde de congés est de <b>%s jours</b>.
+SoldeCPUser=Solde de congés: <b>%s jours</b>.
 ErrorEndDateCP=Vous devez choisir une date de fin supérieur à la date de début.
 ErrorSQLCreateCP=Une erreur SQL est survenue durant la création :
 ErrorIDFicheCP=Une erreur est survenue, cette demande de congés n'existe pas.

From d6e907b69bf72bddae93ac5de264430f7649be5d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 17 Feb 2013 19:25:55 +0100
Subject: [PATCH 136/162] Fix: Nb of holidays was not using correct user

---
 htdocs/holiday/index.php        | 99 +++++++++++++++++++++++----------
 htdocs/langs/en_US/holiday.lang |  2 +-
 htdocs/langs/fr_FR/holiday.lang |  2 +-
 3 files changed, 71 insertions(+), 32 deletions(-)

diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php
index 4dbb299a825..a3ebf0f1c1c 100644
--- a/htdocs/holiday/index.php
+++ b/htdocs/holiday/index.php
@@ -30,6 +30,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+
+$langs->load('users');
+$langs->load('holidays');
 
 // Protection if external user
 if ($user->societe_id > 0) accessforbidden();
@@ -46,6 +51,8 @@ $offset = $conf->liste_limit * $page ;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
+$id = GETPOST('id');
+
 $search_ref      = GETPOST('search_ref');
 $month_create    = GETPOST('month_create');
 $year_create     = GETPOST('year_create');
@@ -72,6 +79,7 @@ $search_statut   = GETPOST('select_statut');
 
 $holiday = new Holiday($db);
 $holidaystatic=new Holiday($db);
+$fuser = new User($db);
 
 // Update sold
 $holiday->updateSold();
@@ -151,28 +159,22 @@ if(!empty($search_statut) && $search_statut != -1) {
 // Récupération de l'ID de l'utilisateur
 $user_id = $user->id;
 
+if ($id > 0)
+{
+	// Charge utilisateur edite
+	$fuser->fetch($id);
+	$fuser->getrights();
+	$user_id = $fuser->id;
+}
 // Récupération des congés payés de l'utilisateur ou de tous les users
-if (!$user->rights->holiday->lire_tous)
+if (!$user->rights->holiday->lire_tous || $id > 0)
 {
-    $holiday_payes = $holiday->fetchByUser($user_id,$order,$filter);
+	$holiday_payes = $holiday->fetchByUser($user_id,$order,$filter);
 }
 else
 {
     $holiday_payes = $holiday->fetchAll($order,$filter);
 }
-
-// Si pas de congés payés
-if ($holiday_payes == 0)
-{
-    print_fiche_titre($langs->trans('CPTitreMenu'));
-
-    print '<div class="tabBar">';
-    print '<span>'.$langs->trans('NoCPforUser').'<br /><br />';
-    print '<a href="./fiche.php?mainmenu=agenda&action=request" class="butAction">'.$langs->trans('AddCP').'</a></span>';
-    print '</div>';
-    exit();
-}
-
 // Si erreur SQL
 if ($holiday_payes == '-1')
 {
@@ -189,14 +191,48 @@ if ($holiday_payes == '-1')
  * Affichage du tableau des congés payés
 *************************************/
 
-$var=true; $num = count($holiday->holiday);
-$html = new Form($db);
-$htmlother = new FormOther($db);
-print_barre_liste($langs->trans("ListeCP"), $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, "", $num);
+$var=true; $num = count($holiday->holiday);
+$form = new Form($db);
+$formother = new FormOther($db);
 
-print '<div class="tabBar">';
+if ($id > 0)
+{
+	$head = user_prepare_head($fuser);
+
+	$title = $langs->trans("User");
+	dol_fiche_head($head, 'paidholidays', $title, 0, 'user');
 
-$nbaquis=$holiday->getCPforUser($user->id);
+	print '<table class="border" width="100%">';
+
+	// Ref
+	print '<tr><td width="25%" valign="top">'.$langs->trans("Ref").'</td>';
+	print '<td colspan="2">';
+	print $form->showrefnav($fuser,'id','',$user->rights->user->user->lire || $user->admin);
+	print '</td>';
+	print '</tr>';
+
+	// Nom
+	print '<tr><td width="25%" valign="top">'.$langs->trans("LastName").'</td>';
+	print '<td colspan="2">'.$fuser->lastname.'</td>';
+	print "</tr>\n";
+
+	// Prenom
+	print '<tr><td width="25%" valign="top">'.$langs->trans("FirstName").'</td>';
+	print '<td colspan="2">'.$fuser->firstname.'</td>';
+	print "</tr>\n";
+
+	print '</table><br>';
+
+}
+else
+{
+	print_barre_liste($langs->trans("ListeCP"), $page, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, "", $num);
+
+	print '<div class="tabBar">';
+}
+
+
+$nbaquis=$holiday->getCPforUser($user_id);
 $nbdeduced=$holiday->getConfCP('nbHolidayDeducted');
 $nb_holiday = $nbaquis / $nbdeduced;
 print $langs->trans('SoldeCPUser',round($nb_holiday,2)).($nbdeduced != 1 ? ' ('.$nbaquis.' / '.$nbdeduced.')' : '');
@@ -223,13 +259,13 @@ print '<input class="flat" size="4" type="text" name="search_ref" value="'.$sear
 // DATE CREATE
 print '<td class="liste_titre" colspan="1" align="center">';
 print '<input class="flat" type="text" size="1" maxlength="2" name="month_create" value="'.$month_create.'">';
-$htmlother->select_year($year_create,'year_create',1, $min_year, $max_year);
+$formother->select_year($year_create,'year_create',1, $min_year, $max_year);
 print '</td>';
 
 // UTILISATEUR
 if($user->rights->holiday->lire_tous) {
     print '<td class="liste_titre" align="left">';
-    $html->select_users($search_employe,"search_employe",1,"",0,'');
+    $form->select_users($search_employe,"search_employe",1,"",0,'');
     print '</td>';
 } else {
     print '<td class="liste_titre">&nbsp;</td>';
@@ -246,7 +282,7 @@ if($user->rights->holiday->lire_tous){
     $validator = new UserGroup($db,$idGroupValid);
     $valideur = $validator->listUsersForGroup();
 
-    $html->select_users($search_valideur,"search_valideur",1,"",0,$valideur,'');
+    $form->select_users($search_valideur,"search_valideur",1,"",0,$valideur,'');
     print '</td>';
 } else {
     print '<td class="liste_titre">&nbsp;</td>';
@@ -255,13 +291,13 @@ if($user->rights->holiday->lire_tous){
 // DATE DEBUT
 print '<td class="liste_titre" colspan="1" align="center">';
 print '<input class="flat" type="text" size="1" maxlength="2" name="month_start" value="'.$month_start.'">';
-$htmlother->select_year($year_start,'year_start',1, $min_year, $max_year);
+$formother->select_year($year_start,'year_start',1, $min_year, $max_year);
 print '</td>';
 
 // DATE FIN
 print '<td class="liste_titre" colspan="1" align="center">';
 print '<input class="flat" type="text" size="1" maxlength="2" name="month_end" value="'.$month_end.'">';
-$htmlother->select_year($year_end,'year_end',1, $min_year, $max_year);
+$formother->select_year($year_end,'year_end',1, $min_year, $max_year);
 print '</td>';
 
 // DUREE
@@ -327,10 +363,13 @@ if($holiday_payes == '2')
 print '</table>';
 print '</form>';
 
-print '<br>';
-print '<div style="float: right; margin-top: 8px;">';
-print '<a href="./fiche.php?action=request" class="butAction">'.$langs->trans('AddCP').'</a>';
-print '</div>';
+if ($user_id == $user->id)
+{
+	print '<br>';
+	print '<div style="float: right; margin-top: 8px;">';
+	print '<a href="./fiche.php?action=request" class="butAction">'.$langs->trans('AddCP').'</a>';
+	print '</div>';
+}
 
 llxFooter();
 
diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index 2b83b1fcb1d..abf2b1dc514 100755
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -26,7 +26,7 @@ SendRequestCP=Creating demand for holidays
 DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
 MenuConfCP=Edit balance of holidays
 UpdateAllCP=Update the holidays
-SoldeCPUser=Your balance of holidays is <b>%s</b> days.
+SoldeCPUser=Holidays balance is <b>%s</b> days.
 ErrorEndDateCP=You must select an end date greater than the start date.
 ErrorSQLCreateCP=An SQL error occurred during the creation:
 ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index 60c7594fe90..ed8d339af75 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -26,7 +26,7 @@ SendRequestCP=Envoyer la demande de congés
 DelayToRequestCP=Les demandes de congés doivent être faites au moins <b>%s jours</b> avant la date</b> de ceux-ci.
 MenuConfCP=Mettre à jour solde
 UpdateAllCP=Mettre à jour les congés
-SoldeCPUser=Votre solde de congés est de <b>%s jours</b>.
+SoldeCPUser=Solde de congés: <b>%s jours</b>.
 ErrorEndDateCP=Vous devez choisir une date de fin supérieur à la date de début.
 ErrorSQLCreateCP=Une erreur SQL est survenue durant la création :
 ErrorIDFicheCP=Une erreur est survenue, cette demande de congés n'existe pas.

From 16e9f6db48770a70f433399edf06a20f721656b1 Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@aternatik.fr>
Date: Sun, 17 Feb 2013 14:37:33 +0100
Subject: [PATCH 137/162] Fix : bad name of property when retrieve extrafields
 for thirdparty

---
 htdocs/core/class/commondocgenerator.class.php | 2 +-
 htdocs/societe/class/societe.class.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index ec9ae1d2870..d64a7c2710b 100755
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -169,7 +169,7 @@ abstract class CommonDocGenerator
         {
         	foreach($object->array_options as $key=>$label)
         	{
-        		$extrafields['company_options_'.$key] = $label;
+        		$extrafields['company_'.$key] = $label;
         	}
         	$array_thirdparty = array_merge($array_thirdparty,$extrafields);
         }
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index dfeec3eaab7..7688eec0d66 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -865,7 +865,7 @@ class Societe extends CommonObject
                 }
                 foreach($extrafields->attribute_label as $key=>$label)
                 {                	
-                	$this->array_options[$key]=$label;
+                	$this->array_options['options_'.$key]=$label;
                 }
             }
             else

From 060060f08ba00e41d499a068bbca6c3a6c17d375 Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@aternatik.fr>
Date: Sun, 17 Feb 2013 20:14:18 +0100
Subject: [PATCH 138/162] Missing object $langs when showing extrafield of type
 'price'

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

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 4f583a667f9..ec02f906e70 100755
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -669,7 +669,7 @@ class ExtraFields
      */
     function showOutputField($key,$value,$moreparam='')
     {
-		global $conf;
+		global $conf,$langs;
 
         $label=$this->attribute_label[$key];
         $type=$this->attribute_type[$key];

From 8ebb48cb5c9464865306c33cfec48bea86568398 Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@aternatik.fr>
Date: Sun, 17 Feb 2013 21:14:00 +0100
Subject: [PATCH 139/162] Fix : in ODT show value and not label of company
 extrafield

---
 htdocs/core/class/commondocgenerator.class.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index d64a7c2710b..3b815e962c0 100755
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -164,14 +164,20 @@ abstract class CommonDocGenerator
         	'company_note'=>$object->note
         );
 
-        $extrafields = array();
+        // Retrieve extrafields
         if(is_array($object->array_options) && count($object->array_options))
         {
-        	foreach($object->array_options as $key=>$label)
+      		if(!class_exists('Extrafields'))
+        		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+        	$extrafields = new ExtraFields($this->db);
+        	$extralabels = $extrafields->fetch_name_optionals_label('company',true);
+        	//Get extrafield values
+        	$object->fetch_optionals($object->id,$extralabels);
+        	 
+        	foreach($extrafields->attribute_label as $key=>$label)
         	{
-        		$extrafields['company_'.$key] = $label;
+        		$array_thirdparty=array_merge($array_thirdparty,array('company_options_'.$key => $object->array_options['options_'.$key]));
         	}
-        	$array_thirdparty = array_merge($array_thirdparty,$extrafields);
         }
         return $array_thirdparty;
     }

From 3ef8c6e5dd33ed6106155e28a6c87ffc3e35929e Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@aternatik.fr>
Date: Mon, 18 Feb 2013 00:40:49 +0100
Subject: [PATCH 140/162] Missing variable declaration

---
 htdocs/core/class/extrafields.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index ec02f906e70..f72ddc8d6e2 100755
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -44,6 +44,10 @@ class ExtraFields
 	var $attribute_unique;
 	// Array to store if attribute is required or not
 	var $attribute_required;
+	// Array to store parameters of attribute (used in select type)
+	var $attribute_param;
+	// Int to store position of attribute
+	var $attribute_pos;
 
 	var $error;
 	var $errno;

From bd2d9cdd3e39282dc904e2ab26ee2d482a7d89e7 Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@aternatik.fr>
Date: Mon, 18 Feb 2013 00:41:50 +0100
Subject: [PATCH 141/162] Split extrafields display into 2 columns (thirdparty)

---
 htdocs/societe/soc.php | 57 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 47 insertions(+), 10 deletions(-)

diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index c1dd0c4c09d..ee8f6e984b1 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -998,14 +998,25 @@ else
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
         if (empty($reshook) && ! empty($extrafields->attribute_label))
         {
+        	$e=0;
             foreach($extrafields->attribute_label as $key=>$label)
             {
+            	$colspan='3';
                 $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:(isset($object->array_options["options_".$key])?$object->array_options["options_".$key]:''));
-           		print '<tr><td';
+                if (($e % 2) == 0)
+                {
+                	print '<tr>';
+                	$colspan='0';
+                }           		
+           		print '<td';
            		if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
-           		print '>'.$label.'</td><td colspan="3">';
+           		print '>'.$label.'</td>';
+           		print '<td colspan="'.$colspan.'">';
                 print $extrafields->showInputField($key,$value);
-                print '</td></tr>'."\n";
+                print '</td>';
+                
+                if (($e % 2) == 1) print '</tr>'."\n";
+                $e++;
             }
         }
 
@@ -1426,23 +1437,38 @@ else
                 print '</td>';
                 print '</tr>';
             }
-
             // Other attributes
             $parameters=array('colspan' => ' colspan="3"', 'colspanvalue' => '3');
             $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
             if (empty($reshook) && ! empty($extrafields->attribute_label))
             {
+            	$old_pos=0;
+            	$e=0;
                 foreach($extrafields->attribute_label as $key=>$label)
                 {
+	                $colspan = '3';
                     $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]);
-            		print '<tr><td';
+                    
+                    if (($e % 2) == 0)
+                    {
+                    	print '<tr>'."\n";
+                    	$colspan = '0';
+                    }
+            		print '<td';
             		if (! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"';
-            		print '>'.$label.'</td><td colspan="3">';
+            		print '>'.$label.'</td>'."\n";
+            		print '<td colspan="'.$colspan.'">';
                     print $extrafields->showInputField($key,$value);
-                    print "</td></tr>\n";
+                    print "</td>"."\n";
+                    
+                    if (($e % 2) == 1 )
+                    {
+                    	print "</tr>\n";
+                    }
+                    $old_pos = $extrafields->attribute_pos[$key];
+                    $e++;
                 }
             }
-
             // Logo
             print '<tr>';
             print '<td>'.$langs->trans("Logo").'</td>';
@@ -1756,12 +1782,23 @@ else
         $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
         if (empty($reshook) && ! empty($extrafields->attribute_label))
         {
+        	$e=0;
             foreach($extrafields->attribute_label as $key=>$label)
             {
+            	$colspan='3';
                 $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:(isset($object->array_options['options_'.$key])?$object->array_options['options_'.$key]:''));
-                print '<tr><td>'.$label.'</td><td colspan="3">';
+                if (($e % 2) == 0) 
+                {
+                	print '<tr>';
+                	$colspan='0';
+                }
+                print '<td>'.$label.'</td>';
+                print '<td colspan="'.$colspan.'">';
                 print $extrafields->showOutputField($key,$value);
-                print "</td></tr>\n";
+                print "</td>";
+                
+                if (($e % 2) == 1) print '</tr>';
+                $e++;
             }
         }
 

From 71a2b4c8c0a4653ca4cceec3a8b945cdce48b36c Mon Sep 17 00:00:00 2001
From: jfefe <jfefe@aternatik.fr>
Date: Mon, 18 Feb 2013 00:58:40 +0100
Subject: [PATCH 142/162] In ODT document add currency symbol with extrafields
 of type "price"

---
 htdocs/core/class/commondocgenerator.class.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 3b815e962c0..aec9e74dcb8 100755
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -171,11 +171,13 @@ abstract class CommonDocGenerator
         		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
         	$extrafields = new ExtraFields($this->db);
         	$extralabels = $extrafields->fetch_name_optionals_label('company',true);
-        	//Get extrafield values
-        	$object->fetch_optionals($object->id,$extralabels);
         	 
         	foreach($extrafields->attribute_label as $key=>$label)
         	{
+        		if($extrafields->attribute_type[$key] == 'price')
+        		{
+        			$object->array_options['options_'.$key] = price($object->array_options['options_'.$key]).' '.$outputlangs->getCurrencySymbol($conf->currency);
+        		}
         		$array_thirdparty=array_merge($array_thirdparty,array('company_options_'.$key => $object->array_options['options_'.$key]));
         	}
         }

From d2cc6d299c70202a7ce7ca9858a24c7b5e104308 Mon Sep 17 00:00:00 2001
From: Grand Philippe <contact@atoo-net.com>
Date: Mon, 18 Feb 2013 12:19:01 +0100
Subject: [PATCH 143/162] fix language

---
 htdocs/langs/fr_FR/admin.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index b471e19b473..e92b474efe7 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -973,7 +973,7 @@ NotificationsDesc= La fonction des notifications par emails permet d'envoyer aut
 ModelModules=Modèle de documents
 DocumentModelOdt=Genération depuis des modèles OpenDocument (Fichier .ODT OpenOffice, KOffice, TextEdit...)
 WatermarkOnDraft=Filigrane sur les documents brouillons
-CompanyIdProfChecker=Id professionel unique 
+CompanyIdProfChecker=Id professionnel unique 
 MustBeUnique=Doit être unique ?
 MustBeMandatory=Doit être obligatoire?
 Miscellanous=Divers

From 37e9b04d8389844ad56e0c57c222f1015a452bb8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Feb 2013 12:57:14 +0100
Subject: [PATCH 144/162] Fix: Check id field are mandatory

---
 htdocs/societe/soc.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index c1dd0c4c09d..a83ac0ca517 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -222,19 +222,20 @@ if (empty($reshook))
 					{
 						$langs->load("errors");
                 		$error++; $errors[] = $langs->transcountry('ProfId'.$i, $object->country_code)." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel);
-                		$action = ($action=='add'?'create':'edit');
+                		$action = (($action=='add'||$action=='create')?'create':'edit');
 					}
 				}
 
 				$idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
+	
 				if (! $vallabel && ! empty($conf->global->$idprof_mandatory))
 				{
 					$langs->load("errors");
 					$error++;
 					$errors[] = $langs->trans("ErrorProdIdIsMandatory", $langs->transcountry('ProfId'.$i, $object->country_code));
-					$action = ($action=='add'?'create':'edit');
+					$action = (($action=='add'||$action=='create')?'create':'edit');
 				}
-			}
+        	}
         }
 
         if (! $error)
@@ -712,8 +713,7 @@ else
             print "<br>\n";
         }
 
-
-        dol_htmloutput_errors($error,$errors);
+        dol_htmloutput_mesg(is_numeric($error)?'':$error, $errors, 'error');
 
         print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formsoc">';
 

From f82bec552b344627f0ca1d9211ae5fee414de34c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Feb 2013 12:57:14 +0100
Subject: [PATCH 145/162] Fix: Check id field are mandatory

---
 htdocs/societe/soc.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 063d33a27f3..135bd6f2295 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -224,19 +224,20 @@ if (empty($reshook))
 					{
 						$langs->load("errors");
                 		$error++; $errors[] = $langs->transcountry('ProfId'.$i, $object->country_code)." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel);
-                		$action = ($action=='add'?'create':'edit');
+                		$action = (($action=='add'||$action=='create')?'create':'edit');
 					}
 				}
 				
 				$idprof_mandatory ='SOCIETE_IDPROF'.($i).'_MANDATORY';
+	
 				if (! $vallabel && ! empty($conf->global->$idprof_mandatory))
 				{
 					$langs->load("errors");
 					$error++;
 					$errors[] = $langs->trans("ErrorProdIdIsMandatory", $langs->transcountry('ProfId'.$i, $object->country_code));
-					$action = ($action=='add'?'create':'edit');
+					$action = (($action=='add'||$action=='create')?'create':'edit');
 				}
-			}
+        	}
         }
           
         if (! $error)
@@ -714,8 +715,7 @@ else
             print "<br>\n";
         }
 
-
-        dol_htmloutput_errors($error,$errors);
+        dol_htmloutput_mesg(is_numeric($error)?'':$error, $errors, 'error');
 
         print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formsoc">';
 

From 0a697e1033e30a69335c6a639249f5b1a991ed66 Mon Sep 17 00:00:00 2001
From: Grand Philippe <contact@atoo-net.com>
Date: Mon, 18 Feb 2013 13:47:46 +0100
Subject: [PATCH 146/162] fix language

---
 htdocs/langs/fr_FR/admin.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index e92b474efe7..216d9b67de4 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -47,9 +47,9 @@ DictionnarySetup= Dictionnaires
 Dictionnary= Dictionnaires
 DisableJavascript= Désactiver les fonctions Javascript et Ajax
 ConfirmAjax= Utiliser les popups de confirmation Ajax
-UseSearchToSelectCompany= Utiliser un champ avec autocomplétion pour choisir un tiers (plutôt qu'une liste déroulante).<br><br>Notez que si vous avez un nombre important de produits ou services (> 100 000), vous pouvez améliorer les performances en définissant la constante SOCIETE_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limitée au début de la chaine.
+UseSearchToSelectCompany= Utiliser un champ avec autocomplétion pour choisir un tiers (plutôt qu'une liste déroulante).<br><br>Notez que si vous avez un nombre important de tiers (> 100 000), vous pouvez améliorer les performances en définissant la constante SOCIETE_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limitée au début de la chaine.
 ActivityStateToSelectCompany= Ajouter une option de filtrage lors des recherches pour afficher/masquer les tiers en exercice ou ayant cessés d'exercer
-UseSearchToSelectContact= Utiliser un champ avec autocomplétion pour choisir un contact (plutôt qu'une liste déroulante).<br><br>Notez que si vous avez un nombre important de produits ou services (> 100 000), vous pouvez améliorer les performances en définissant la constante CONTACT_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limitée au début de la chaine.
+UseSearchToSelectContact= Utiliser un champ avec autocomplétion pour choisir un contact (plutôt qu'une liste déroulante).<br><br>Notez que si vous avez un nombre important de contacts (> 100 000), vous pouvez améliorer les performances en définissant la constante CONTACT_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limitée au début de la chaine.
 SearchFilter=Options des filtres de recherche
 NumberOfKeyToSearch=Nb carac. déclenchant recherche: %s
 ViewFullDateActions= Visualiser les dates des actions en entier dans la fiche tiers

From b5260e4ab1b086a179cccd0182127249258480ac Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Feb 2013 14:13:02 +0100
Subject: [PATCH 147/162] Fix: Translation

---
 htdocs/langs/en_US/admin.lang   | 2 +-
 htdocs/langs/fr_FR/admin.lang   | 2 +-
 htdocs/langs/fr_FR/holiday.lang | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 9586ce352a8..7bcb30a2d62 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -967,7 +967,7 @@ NotificationsDesc=EMails notifications feature allows you to silently send autom
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
-CompanyIdProfChecker=Professional Id unique
+CompanyIdProfChecker=Rules ono Professional Ids
 MustBeUnique=Must be unique ?
 MustBeMandatory=Must be mandatory ?
 Miscellanous=Miscellaneous
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index adb0a063d5d..ffa72893e4a 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -962,7 +962,7 @@ NotificationsDesc= La fonction des notifications par emails permet d'envoyer aut
 ModelModules=Modèle de documents
 DocumentModelOdt=Genération depuis des modèles OpenDocument (Fichier .ODT OpenOffice, KOffice, TextEdit...)
 WatermarkOnDraft=Filigrane sur les documents brouillons
-CompanyIdProfChecker=Id professionel unique 
+CompanyIdProfChecker=Règles sur les Ids professionels 
 MustBeUnique=Doit être unique ?
 MustBeMandatory=Doit être obligatoire?
 Miscellanous=Divers
diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index ed8d339af75..ad8ebd7fcf1 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -91,7 +91,7 @@ LastDayOfHoliday=Dernier jour de congès
 ConfCP=Configuration du module Congés
 DescOptionCP=Description de l'option
 ValueOptionCP=Valeur
-GroupToValidateCP=Groupe ayant la possibilité de valider les congés
+GroupToValidateCP=Groupe ayant la possibilité d'approuver les congés
 ConfirmConfigCP=Valider la configuration
 LastUpdateCP=Dernière mise à jour automatique des congés
 UpdateConfCPOK=Mise à jour effectuée avec succès.

From b484fef22a5909d9e55ca96c1dd28446e43047e2 Mon Sep 17 00:00:00 2001
From: Grand Philippe <contact@atoo-net.com>
Date: Mon, 18 Feb 2013 14:19:01 +0100
Subject: [PATCH 148/162] fix language

---
 htdocs/langs/fr_FR/admin.lang | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 216d9b67de4..a43179386de 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -931,11 +931,11 @@ MAIN_PROXY_PORT=Port du serveur proxy mandataire
 MAIN_PROXY_USER=Login pour passer le serveur proxy mandataire
 MAIN_PROXY_PASS=Mot de passe pour passer le serveur proxy mandataire
 DefineHereComplementaryAttributes=Définissez ici la liste des attributs supplémentaires, non disponibles en standard, et que vous voulez voir gérer sur les %s.
-ExtraFields=Attributs suplémentaires
-ExtraFieldsThirdParties=Attributs suplémentaires (tiers)
-ExtraFieldsContacts=Attributs suplémentaires (contacts/adresses)
-ExtraFieldsMember=Attributs suplémentaires (adhérents)
-ExtraFieldsMemberType=Attributs suplémentaires (type d'adhérents)
+ExtraFields=Attributs supplémentaires
+ExtraFieldsThirdParties=Attributs supplémentaires (tiers)
+ExtraFieldsContacts=Attributs supplémentaires (contacts/adresses)
+ExtraFieldsMember=Attributs supplémentaires (adhérents)
+ExtraFieldsMemberType=Attributs supplémentaires (type d'adhérents)
 ExtraFieldHasWrongValue=L'attribut %s a une valeur incorrecte.
 AlphaNumOnlyCharsAndNoSpace=uniquement caractères alphanumériques sans espace
 SendingMailSetup=Configuration de l'envoi par mail

From e9dc4b9db3ffa96d9e4a64e8cee6b815a8ebbf25 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 18 Feb 2013 15:15:10 +0100
Subject: [PATCH 149/162] Fix: We must not add month holidays after init of
 sold.

---
 htdocs/holiday/define_holiday.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 586ae4db258..079ecd01e03 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -72,6 +72,13 @@ if ($action == 'update' && isset($_POST['update_cp']))
     // Mise à jour des congés de l'utilisateur
     $holiday->updateSoldeCP($userID,$userValue);
 
+    // If it first update of sold, we set date to havoid to have sold incremented by new month
+	$now=dol_now();
+    $sql = "UPDATE ".MAIN_DB_PREFIX."holiday_config SET";
+    $sql.= " value = '".dol_print_date($now,'%Y%m%d%H%M%S')."'";
+    $sql.= " WHERE name = 'lastUpdate' and value IS NULL";	// Add value IS NULL to be sure to update only at init.
+    dol_syslog('define_holiday update lastUpdate entry sql='.$sql);
+    $result = $db->query($sql);    
 
     $mesg='<div class="ok">'.$langs->trans('UpdateConfCPOK').'</div>';
 

From fd4a465c909cd4e1f976bf73c89bfb168d25d773 Mon Sep 17 00:00:00 2001
From: fhenry <florian.henry@open-concept.pro>
Date: Mon, 18 Feb 2013 15:25:13 +0100
Subject: [PATCH 150/162] Fix mass maling tabs regression

---
 htdocs/core/lib/emailing.lib.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/emailing.lib.php b/htdocs/core/lib/emailing.lib.php
index e68a62a2768..394f8b72349 100644
--- a/htdocs/core/lib/emailing.lib.php
+++ b/htdocs/core/lib/emailing.lib.php
@@ -31,12 +31,6 @@ function emailing_prepare_head($object)
 {
 	global $user, $langs, $conf;
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'emailing');
-	
 	$h = 0;
 	$head = array();
 
@@ -58,6 +52,8 @@ function emailing_prepare_head($object)
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;
+	
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'emailing');
 
 	complete_head_from_modules($conf,$langs,$object,$head,$h,'emailing','remove');
 

From 3e42f90b1ec7291a499a100b3a9afd44f706e1b2 Mon Sep 17 00:00:00 2001
From: fhenry <florian.henry@open-concept.pro>
Date: Tue, 19 Feb 2013 04:48:39 +0100
Subject: [PATCH 151/162] Better to use foreach because when add mail in $cible
 array we can test with (!array_key_exists($obj->email, $cibles)) better than
 old method

---
 .../modules/mailings/modules_mailings.php     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index 5dc82e85d63..ea9a54651a9 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -150,9 +150,9 @@ class MailingTargets    // This can't be abstract as it is used for some method
         // Insert emailing targest from array into database
         $j = 0;
         $num = count($cibles);
-        for ($i = 0 ; $i < $num ; $i++)
+        foreach ($cibles as $targetarray)
         {
-        	if (! empty($cibles[$i]['email'])) // avoid empty email address
+        	if (! empty($targetarray['email'])) // avoid empty email address
         	{
         		$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_cibles";
         		$sql .= " (fk_mailing,";
@@ -163,17 +163,17 @@ class MailingTargets    // This can't be abstract as it is used for some method
         		}
         		$sql.= " source_type)";
         		$sql .= " VALUES (".$mailing_id.",";
-        		$sql .= (empty($cibles[$i]['fk_contact']) ? '0' : "'".$cibles[$i]['fk_contact']."'") .",";
-        		$sql .= "'".$this->db->escape($cibles[$i]['name'])."',";
-        		$sql .= "'".$this->db->escape($cibles[$i]['firstname'])."',";
-        		$sql .= "'".$this->db->escape($cibles[$i]['email'])."',";
-        		$sql .= "'".$this->db->escape($cibles[$i]['other'])."',";
-        		$sql .= "'".$this->db->escape($cibles[$i]['source_url'])."',";
-        		$sql .= "'".$this->db->escape($cibles[$i]['source_id'])."',";
+        		$sql .= (empty($targetarray['fk_contact']) ? '0' : "'".$targetarray['fk_contact']."'") .",";
+        		$sql .= "'".$this->db->escape($targetarray['name'])."',";
+        		$sql .= "'".$this->db->escape($targetarray['firstname'])."',";
+        		$sql .= "'".$this->db->escape($targetarray['email'])."',";
+        		$sql .= "'".$this->db->escape($targetarray['other'])."',";
+        		$sql .= "'".$this->db->escape($targetarray['source_url'])."',";
+        		$sql .= "'".$this->db->escape($targetarray['source_id'])."',";
         		if (! empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE)) {
-        			$sql .= "'".$this->db->escape(md5($cibles[$i]['email'].';'.$cibles[$i]['name'].';'.$mailing_id.';'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY))."',";
+        			$sql .= "'".$this->db->escape(md5($targetarray['email'].';'.$targetarray['name'].';'.$mailing_id.';'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY))."',";
         		}
-        		$sql .= "'".$this->db->escape($cibles[$i]['source_type'])."')";
+        		$sql .= "'".$this->db->escape($targetarray['source_type'])."')";
         		$result=$this->db->query($sql);
         		if ($result)
         		{

From df0f281efd26b18da00dec6794191f101ecf9db0 Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Mon, 18 Feb 2013 17:07:20 +0100
Subject: [PATCH 152/162] Fix: Translation

---
 htdocs/langs/ca_ES/admin.lang   | 2 +-
 htdocs/langs/es_ES/admin.lang   | 2 +-
 htdocs/langs/es_ES/holiday.lang | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index b144352fcf2..5bbc3472c98 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -960,7 +960,7 @@ NotificationsDesc=La funció de les notificacions permet enviar automàticament
 ModelModules=Models de documents
 DocumentModelOdt=Generació des dels documents amb format OpenDocument (Arxiu .ODT OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Marca d'aigua en els documents esborrany
-CompanyIdProfChecker=Id Professional únic
+CompanyIdProfChecker=Règles sobre els ID professionals
 MustBeUnique=Ha de ser únic?
 MustBeMandatory=Ha de ser obligatori?
 Miscellanous=Miscel·lània
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 2c0cc6c36e1..cbf15193742 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -962,7 +962,7 @@ NotificationsDesc=La función de las notificaciones permite enviar automáticame
 ModelModules=Modelos de documentos
 DocumentModelOdt=Generación desde los documentos OpenDocument (Archivo .ODT OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Marca de agua en los documentos borrador
-CompanyIdProfChecker=Id Profesional único
+CompanyIdProfChecker=Reglas sobre los ID profesionales
 MustBeUnique=¿Debe ser único?
 MustBeMandatory=¿Debe ser obligatorio?
 Miscellanous=Miscelánea
diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang
index 4d7344cc10c..3183101f294 100644
--- a/htdocs/langs/es_ES/holiday.lang
+++ b/htdocs/langs/es_ES/holiday.lang
@@ -91,7 +91,7 @@ LastDayOfHoliday=Último día libre
 ConfCP=Configuración del módulo Vacaciones
 DescOptionCP=Descripción de la opción
 ValueOptionCP=Valor
-GroupToValidateCP=Grupo con posibilidad de validar las vacaciones
+GroupToValidateCP=Grupo con posibilidad de aprobar las vacaciones
 ConfirmConfigCP=Validar la configuración
 LastUpdateCP=Última actualización automática de vacaciones
 UpdateConfCPOK=Actualización efectuada correctamente.

From 7367a2472c5a6292744f436d20480c224e5dcbbf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 19 Feb 2013 13:24:32 +0100
Subject: [PATCH 153/162] Look: Mor CSS3

---
 htdocs/comm/action/fiche.php           |  4 +++-
 htdocs/comm/action/index.php           | 11 ++++++++---
 htdocs/langs/en_US/users.lang          |  3 ++-
 htdocs/langs/fr_FR/users.lang          |  3 ++-
 htdocs/theme/amarok/style.css.php      | 11 +++++++----
 htdocs/theme/auguria/style.css.php     |  3 +++
 htdocs/theme/bureau2crea/style.css.php | 15 +++++++++++----
 htdocs/theme/cameleo/style.css.php     | 15 +++++++++++----
 htdocs/theme/eldy/style.css.php        | 13 +++++++++----
 htdocs/user/index.php                  |  2 +-
 10 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php
index af09519cfef..f5fdb2cfabb 100644
--- a/htdocs/comm/action/fiche.php
+++ b/htdocs/comm/action/fiche.php
@@ -407,6 +407,8 @@ if ($action == 'create')
 		if ($result < 0) dol_print_error($db,$contact->error);
 	}
 
+	dol_set_focus("#label");
+	
     if (! empty($conf->use_javascript_ajax))
     {
         print "\n".'<script type="text/javascript">';
@@ -480,7 +482,7 @@ if ($action == 'create')
 	else print '<input type="hidden" name="actioncode" value="AC_OTH">';
 
 	// Title
-	print '<tr><td'.(empty($conf->global->AGENDA_USE_EVENT_TYPE)?' class="fieldrequired"':'').'>'.$langs->trans("Title").'</td><td><input type="text" name="label" size="60" value="'.GETPOST('label').'"></td></tr>';
+	print '<tr><td'.(empty($conf->global->AGENDA_USE_EVENT_TYPE)?' class="fieldrequired"':'').'>'.$langs->trans("Title").'</td><td><input type="text" id="label" name="label" size="60" value="'.GETPOST('label').'"></td></tr>';
 
     // Full day
     print '<tr><td class="fieldrequired">'.$langs->trans("EventOnFullDay").'</td><td><input type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday')?' checked="checked"':'').'></td></tr>';
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index cbf8ef0840e..2dc15e536a1 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -753,7 +753,7 @@ if (empty($action) || $action == 'show_month')      // View by month
     $newparam=preg_replace('/month=[0-9]+&?/i','',$newparam);
     $newparam=preg_replace('/year=[0-9]+&?/i','',$newparam);
     $newparam=preg_replace('/showbirthday_=/i','showbirthday=',$newparam);	// Restore correct parameter
-    echo '<table width="100%" class="nocellnopadd">';
+    echo '<table width="100%" class="nocellnopadd cal_month">';
     echo ' <tr class="liste_titre">';
     $i=0;
     while ($i < 7)
@@ -778,6 +778,7 @@ if (empty($action) || $action == 'show_month')      // View by month
             if ($tmpday <= 0)
             {
                 $style='cal_other_month cal_past';
+        		if ($iter_day == 6) $style.=' cal_other_month_right';
                 echo '  <td class="'.$style.'" width="14%" valign="top"  nowrap="nowrap">';
                 show_day_events($db, $max_day_in_prev_month + $tmpday, $prev_month, $prev_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
                 echo "  </td>\n";
@@ -788,6 +789,7 @@ if (empty($action) || $action == 'show_month')      // View by month
                 $curtime = dol_mktime(0, 0, 0, $month, $tmpday, $year);
 
                 $style='cal_current_month';
+                if ($iter_day == 6) $style.=' cal_current_month_right';
                 $today=0;
                 if ($todayarray['mday']==$tmpday && $todayarray['mon']==$month && $todayarray['year']==$year) $today=1;
                 if ($today) $style='cal_today';
@@ -801,6 +803,7 @@ if (empty($action) || $action == 'show_month')      // View by month
             else
             {
                 $style='cal_other_month';
+                if ($iter_day == 6) $style.=' cal_other_month_right';
                 echo '  <td class="'.$style.'" width="14%" valign="top"  nowrap="nowrap">';
                 show_day_events($db, $tmpday - $max_day_in_month, $next_month, $next_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
                 echo "</td>\n";
@@ -821,7 +824,7 @@ elseif ($action == 'show_week') // View by week
     $newparam=preg_replace('/month=[0-9]+&?/i','',$newparam);
     $newparam=preg_replace('/year=[0-9]+&?/i','',$newparam);
     $newparam=preg_replace('/showbirthday_=/i','showbirthday=',$newparam);	// Restore correct parameter
-    echo '<table width="100%" class="nocellnopadd">';
+    echo '<table width="100%" class="nocellnopadd cal_month">';
     echo ' <tr class="liste_titre">';
     $i=0;
     while ($i < 7)
@@ -845,6 +848,7 @@ elseif ($action == 'show_week') // View by week
             $curtime = dol_mktime(0, 0, 0, $month, $tmpday, $year);
 
             $style='cal_current_month';
+        	if ($iter_day == 6) $style.=' cal_other_month_right';
             $today=0;
             $todayarray=dol_getdate($now,'fast');
             if ($todayarray['mday']==$tmpday && $todayarray['mon']==$month && $todayarray['year']==$year) $today=1;
@@ -857,6 +861,7 @@ elseif ($action == 'show_week') // View by week
         else
         {
             $style='cal_current_month';
+        	if ($iter_day == 6) $style.=' cal_other_month_right';
             echo '  <td class="'.$style.'" width="14%" valign="top"  nowrap="nowrap">';
             show_day_events($db, $tmpday - $max_day_in_month, $next_month, $next_year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300);
             echo "</td>\n";
@@ -1005,7 +1010,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     // Show rect of event
                     print '<div id="event_'.$ymd.'_'.$i.'" class="event '.$cssclass.'">';
                     print '<ul class="cal_event"><li class="cal_event">';
-                    print '<table class="cal_event" style="background: #'.$color.'; -moz-border-radius:4px; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,2).')); " width="100%"><tr>';
+                    print '<table class="cal_event" style="background: #'.$color.'; -moz-border-radius:4px; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,1).')); " width="100%"><tr>';
                     print '<td nowrap="nowrap" class="cal_event">';
                     if ($event->type_code == 'BIRTHDAY') // It's a birthday
                     {
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index e9a49faebea..b922617ef31 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -114,4 +114,5 @@ YourRole=Your roles
 YourQuotaOfUsersIsReached=Your quota of active users is reached !
 NbOfUsers=Nb of users
 DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
-HierarchicalResponsible=Hierarchical responsible
\ No newline at end of file
+HierarchicalResponsible=Hierarchical responsible
+HierarchicView=Hierarchical view
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 95ff8a405fc..2b6e398d035 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -114,4 +114,5 @@ YourRole=Vos rôles
 YourQuotaOfUsersIsReached=Votre quota d'utilisateurs actifs est atteint !
 NbOfUsers=Nb d'utilisateurs
 DontDowngradeSuperAdmin=Seul un superadmin peut rétrograder un superadmin
-HierarchicalResponsible=Responsable hierarchique
\ No newline at end of file
+HierarchicalResponsible=Responsable hierarchique
+HierarchicView=Vue hiérarchique
\ No newline at end of file
diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index 71a1c47b375..80a07bd88fa 100755
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -1442,19 +1442,22 @@ td.hidden {display:none;}
 /*  Module agenda                                                                 */
 /* ============================================================================== */
 
+table.cal_month    { border-spacing: 0px; }
+.cal_current_month { border-top: 0; border-left: solid 1px #E0E0E0; border-right: 0; border-bottom: solid 1px #E0E0E0; }
+.cal_other_month   { border-top: 0; border-left: solid 1px #C0C0C0; border-right: 0; border-bottom: solid 1px #C0C0C0; }
+.cal_current_month_right { border-right: solid 1px #E0E0E0; }
+.cal_other_month_right   { border-right: solid 1px #C0C0C0; } 
+
 .cal_other_month {
 	background:#dddddd;
-	border:solid 1px #bbbbbb;
 }
 
 .cal_past_month {
 	background:#eeeeee;
-	border:solid 1px #bbbbbb;
 }
 
 .cal_current_month {
 	background:#ffffff;
-	border:solid 1px #bbbbbb;
 }
 
 .cal_today {
@@ -1469,7 +1472,7 @@ table.cal_event {
 	margin-bottom:1px;
 }
 
-ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; -webkit-padding-start: 2px !important; }
+ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; -webkit-padding-start: 0px; -webkit-padding-start: 0px; }
 li.cal_event       { border: none; list-style-type: none; }
 
 .cal_event a:link {
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index 47a9f3d551c..68012ee1491 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -1685,12 +1685,15 @@ td.hidden {
 /*  Module agenda                                                                 */
 /* ============================================================================== */
 
+table.cal_month    { border-spacing: 0px; }
 .cal_other_month   { background: #DDDDDD; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_past_month    { background: #EEEEEE; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_today         { background: #FFFFFF; border: solid 2px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 table.cal_event    { border-collapse: collapse; margin-bottom: 1px; }
 table.cal_event td { border: 0px; padding-<?php print $left; ?>: 0px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
+ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; -webkit-padding-start: 0px; -webkit-padding-start: 0px; }
+li.cal_event       { border: none; list-style-type: none; }
 .cal_event a:link    { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:active  { color: #111111; font-size: 11px; font-weight: normal !important; }
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index c0f4c8c3250..8f8238c15db 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -1847,12 +1847,19 @@ td.hidden {
 /*  Module agenda                                                                 */
 /* ============================================================================== */
 
-.cal_other_month   { background: #DDDDDD; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
-.cal_past_month    { background: #EEEEEE; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
-.cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
-.cal_today         { background: #FFFFFF; border: solid 2px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+table.cal_month    { border-spacing: 0px; }
+.cal_current_month { border-top: 0; border-left: solid 1px #E0E0E0; border-right: 0; border-bottom: solid 1px #E0E0E0; }
+.cal_other_month   { border-top: 0; border-left: solid 1px #C0C0C0; border-right: 0; border-bottom: solid 1px #C0C0C0; }
+.cal_current_month_right { border-right: solid 1px #E0E0E0; }
+.cal_other_month_right   { border-right: solid 1px #C0C0C0; } 
+.cal_other_month   { background: #DDDDDD; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_past_month    { background: #EEEEEE; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_current_month { background: #FFFFFF; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_today         { background: #FFFFFF; border: solid 2px #C0C0C0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 table.cal_event    { border-collapse: collapse; margin-bottom: 1px; }
 table.cal_event td { border: 0px; padding-<?php print $left; ?>: 0px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
+ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; -webkit-padding-start: 0px; -webkit-padding-start: 0px; }
+li.cal_event       { border: none; list-style-type: none; }
 .cal_event a:link    { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:active  { color: #111111; font-size: 11px; font-weight: normal !important; }
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index 7c341f43e9f..c025a98d126 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -1781,12 +1781,19 @@ td.hidden {
 /*  Module agenda                                                                 */
 /* ============================================================================== */
 
-.cal_other_month   { background: #DDDDDD; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
-.cal_past_month    { background: #EEEEEE; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
-.cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
-.cal_today         { background: #FFFFFF; border: solid 2px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+table.cal_month    { border-spacing: 0px; }
+.cal_current_month { border-top: 0; border-left: solid 1px #E0E0E0; border-right: 0; border-bottom: solid 1px #E0E0E0; }
+.cal_other_month   { border-top: 0; border-left: solid 1px #C0C0C0; border-right: 0; border-bottom: solid 1px #C0C0C0; }
+.cal_current_month_right { border-right: solid 1px #E0E0E0; }
+.cal_other_month_right   { border-right: solid 1px #C0C0C0; } 
+.cal_other_month   { background: #DDDDDD; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_past_month    { background: #EEEEEE; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_current_month { background: #FFFFFF; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_today         { background: #FFFFFF; border: solid 2px #C0C0C0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 table.cal_event    { border-collapse: collapse; margin-bottom: 1px; }
 table.cal_event td { border: 0px; padding-<?php print $left; ?>: 0px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
+ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; -webkit-padding-start: 0px; -webkit-padding-start: 0px; }
+li.cal_event       { border: none; list-style-type: none; }
 .cal_event a:link    {font-size: 11px; font-weight: bold !important; }
 .cal_event a:visited {font-size: 11px; font-weight: bold !important; }
 .cal_event a:active  {font-size: 11px; font-weight: bold !important; }
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 6e51e2d257e..a1250674380 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2054,9 +2054,14 @@ td.hidden {
 /*  Module agenda                                                                 */
 /* ============================================================================== */
 
-.cal_other_month   { opacity: 0.6; background: #DDDDDD; border: solid 1px #C0C0C0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
-.cal_past_month    { opacity: 0.6; background: #EEEEEE; border: solid 1px #C0C0C0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
-.cal_current_month { background: #FFFFFF; border: solid 1px #C0C0C0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+table.cal_month    { border-spacing: 0px; }
+.cal_current_month { border-top: 0; border-left: solid 1px #E0E0E0; border-right: 0; border-bottom: solid 1px #E0E0E0; }
+.cal_other_month   { border-top: 0; border-left: solid 1px #C0C0C0; border-right: 0; border-bottom: solid 1px #C0C0C0; }
+.cal_current_month_right { border-right: solid 1px #E0E0E0; }
+.cal_other_month_right   { border-right: solid 1px #C0C0C0; } 
+.cal_other_month   { opacity: 0.6; background: #DDDDDD; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_past_month    { opacity: 0.6; background: #EEEEEE; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
+.cal_current_month { background: #FFFFFF; border-left: solid 1px #E0E0E0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_today         { background: #FFFFFF; border: solid 2px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_past          { }
 table.cal_event    { border: none; border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px;
@@ -2066,7 +2071,7 @@ table.cal_event    { border: none; border-collapse: collapse; margin-bottom: 1px
 						background: -webkit-gradient(linear, left top, left bottom, from(#006aac), to(#00438d));
 						}
 table.cal_event td { border: none; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
-ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; -webkit-padding-start: 2px !important; }
+ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; -moz-padding-start: 0px; -webkit-padding-start: 0px; }
 li.cal_event       { border: none; list-style-type: none; }
 .cal_event a:link    { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; }
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 77ce0ea732c..93d6f3e8054 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -63,7 +63,7 @@ $companystatic = new Societe($db);
 
 llxHeader();
 
-print_fiche_titre($langs->trans("ListOfUsers"));
+print_fiche_titre($langs->trans("ListOfUsers"), '<form action="'.DOL_URL_ROOT.'/user/hierarchy.php" method="POST"><input type="submit" class="button" style="width:120px" name="viewcal" value="'.dol_escape_htmltag($langs->trans("HierarchicView")).'"></form>');
 
 $sql = "SELECT u.rowid, u.name, u.firstname, u.admin, u.fk_societe, u.login,";
 $sql.= " u.datec,";

From 95098a9b59eec34384b425f61b3eff0cdc13981c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 19 Feb 2013 15:23:25 +0100
Subject: [PATCH 154/162] Fix: Menu editor

---
 htdocs/admin/menus.php       | 44 +++++++++++++++++++++---------------
 htdocs/admin/menus/index.php | 24 ++++++++++++--------
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index e40af9b75dc..64f063121fe 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -68,7 +68,7 @@ error_reporting($err);
 if ($action == 'update' && empty($_POST["cancel"]))
 {
 	$_SESSION["mainmenu"]="home";   // Le gestionnaire de menu a pu changer
-
+	
 	dolibarr_set_const($db, "MAIN_MENU_STANDARD",      $_POST["MAIN_MENU_STANDARD"],'chaine',0,'',$conf->entity);
 	dolibarr_set_const($db, "MAIN_MENU_SMARTPHONE",     $_POST["MAIN_MENU_SMARTPHONE"],'chaine',0,'',$conf->entity);
 
@@ -77,29 +77,37 @@ if ($action == 'update' && empty($_POST["cancel"]))
 
 	// Define list of menu handlers to initialize
 	$listofmenuhandler=array();
+	$listofmenuhandler[preg_replace('/(_backoffice|_frontoffice|_menu)?\.php/i','',$_POST["MAIN_MENU_STANDARD"])]=1;
+	$listofmenuhandler[preg_replace('/(_backoffice|_frontoffice|_menu)?\.php/i','',$_POST["MAIN_MENUFRONT_STANDARD"])]=1;
+	if (isset($_POST["MAIN_MENU_SMARTPHONE"]))      $listofmenuhandler[preg_replace('/(_backoffice|_frontoffice|_menu)?\.php/i','',$_POST["MAIN_MENU_SMARTPHONE"])]=1;
+	if (isset($_POST["MAIN_MENUFRONT_SMARTPHONE"])) $listofmenuhandler[preg_replace('/(_backoffice|_frontoffice|_menu)?\.php/i','',$_POST["MAIN_MENUFRONT_SMARTPHONE"])]=1;
 
 	// Initialize menu handlers
 	foreach ($listofmenuhandler as $key => $val)
 	{
 		// Load sql init_menu_handler.sql file
-        $dir = "/core/menus/";
-	    $file='init_menu_'.$key.'.sql';
-	    $fullpath=dol_buildpath($dir.$file);
-
-		if (file_exists($fullpath))
-		{
-			$db->begin();
-
-			$result=run_sql($fullpath,1,'',1,$key,'none');
-			if ($result > 0)
+		$dirmenus=array_merge(array("/core/menus/"),(array) $conf->modules_parts['menus']);
+		foreach($dirmenus as $dirmenu)
+		{
+			$file='init_menu_'.$key.'.sql';
+		    $fullpath=dol_buildpath($dirmenu.$file);
+		    //print 'action='.$action.' Search menu into fullpath='.$fullpath.'<br>';exit;
+		    
+			if (file_exists($fullpath))
 			{
-				$db->commit();
-			}
-			else
-			{
-				$error++;
-				$errmsgs[]='Failed to initialize menu '.$key.'.';
-				$db->rollback();
+				$db->begin();
+	
+				$result=run_sql($fullpath,1,'',1,$key,'none');
+				if ($result > 0)
+				{
+					$db->commit();
+				}
+				else
+				{
+					$error++;
+					$errmsgs[]='Failed to initialize menu '.$key.'.';
+					$db->rollback();
+				}
 			}
 		}
 	}
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index d2615ea3049..b31bf8b7afa 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -47,20 +47,24 @@ $mesg=GETPOST('mesg');
 
 $menu_handler_top=$conf->global->MAIN_MENU_STANDARD;
 $menu_handler_smartphone=$conf->global->MAIN_MENU_SMARTPHONE;
-$menu_handler_top=preg_replace('/_backoffice.php/i','',$menu_handler_top);
-$menu_handler_top=preg_replace('/_frontoffice.php/i','',$menu_handler_top);
-$menu_handler_smartphone=preg_replace('/_backoffice.php/i','',$menu_handler_smartphone);
-$menu_handler_smartphone=preg_replace('/_frontoffice.php/i','',$menu_handler_smartphone);
+$menu_handler_top=preg_replace('/(_backoffice\.php|_menu\.php)/i','',$menu_handler_top);
+$menu_handler_top=preg_replace('/(_frontoffice\.php|_menu\.php)/i','',$menu_handler_top);
+$menu_handler_smartphone=preg_replace('/(_backoffice\.php|_menu\.php)/i','',$menu_handler_smartphone);
+$menu_handler_smartphone=preg_replace('/(_frontoffice\.php|_menu\.php)/i','',$menu_handler_smartphone);
 
 $menu_handler=$menu_handler_top;
 
+
 if (GETPOST("handler_origine")) $menu_handler=GETPOST("handler_origine");
 if (GETPOST("menu_handler"))    $menu_handler=GETPOST("menu_handler");
 
+$menu_handler_to_search=preg_replace('/(_backoffice|_menu)?(\.php)?/i','',$menu_handler);
+$menu_handler_to_search=preg_replace('/(_frontoffice|_menu)?(\.php)?/i','',$menu_handler);
+
 
 /*
-* Actions
-*/
+ * Actions
+ */
 
 if ($action == 'up')
 {
@@ -89,7 +93,7 @@ if ($action == 'up')
 	$sql = "SELECT m.rowid, m.position";
 	$sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
 	$sql.= " WHERE (m.position < ".($current['order'])." OR (m.position = ".($current['order'])." AND rowid < ".$_GET["menuId"]."))";
-	$sql.= " AND m.menu_handler='".$menu_handler."'";
+	$sql.= " AND m.menu_handler='".$menu_handler_to_search."'";
 	$sql.= " AND m.entity = ".$conf->entity;
 	$sql.= " AND m.type = '".$current['type']."'";
 	$sql.= " AND m.fk_menu = '".$current['fk_menu']."'";
@@ -145,7 +149,7 @@ elseif ($action == 'down')
 	$sql = "SELECT m.rowid, m.position";
 	$sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
 	$sql.= " WHERE (m.position > ".($current['order'])." OR (m.position = ".($current['order'])." AND rowid > ".$_GET["menuId"]."))";
-	$sql.= " AND m.menu_handler='".$menu_handler."'";
+	$sql.= " AND m.menu_handler='".$menu_handler_to_search."'";
 	$sql.= " AND m.entity = ".$conf->entity;
 	$sql.= " AND m.type = '".$current['type']."'";
 	$sql.= " AND m.fk_menu = '".$current['fk_menu']."'";
@@ -255,7 +259,7 @@ if ($action == 'delete')
 print '<form name="newmenu" class="nocellnopadd" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" action="change_menu_handler">';
 print $langs->trans("MenuHandler").': ';
-print $formadmin->select_menu_families($menu_handler,'menu_handler',array_merge($dirstandard,$dirsmartphone));
+print $formadmin->select_menu_families($menu_handler.(preg_match('/_menu/',$menu_handler)?'':'_menu'),'menu_handler',array_merge($dirstandard,$dirsmartphone));
 print ' &nbsp; <input type="submit" class="button" value="'.$langs->trans("Refresh").'">';
 print '</form>';
 
@@ -294,7 +298,7 @@ if ($conf->use_javascript_ajax)
 
 	$sql = "SELECT m.rowid, m.titre, m.langs, m.mainmenu, m.leftmenu, m.fk_menu, m.fk_mainmenu, m.fk_leftmenu";
 	$sql.= " FROM ".MAIN_DB_PREFIX."menu as m";
-	$sql.= " WHERE menu_handler = '".$menu_handler."'";
+	$sql.= " WHERE menu_handler = '".$menu_handler_to_search."'";
 	$sql.= " AND entity = ".$conf->entity;
 	$sql.= " AND fk_menu >= 0";
 	$sql.= " ORDER BY m.position, m.rowid";		// Order is position then rowid (because we need a sort criteria when position is same)

From 46170c0255ef0fcf4e2170b2c706c2ed267ae836 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 19 Feb 2013 15:33:49 +0100
Subject: [PATCH 155/162] New: Focus on first field

---
 htdocs/categories/fiche.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/categories/fiche.php b/htdocs/categories/fiche.php
index 32139328d9c..8aa2bb8df0c 100644
--- a/htdocs/categories/fiche.php
+++ b/htdocs/categories/fiche.php
@@ -42,7 +42,7 @@ $type 		= GETPOST('type','alpha');
 $urlfrom	= GETPOST('urlfrom','alpha');
 
 $socid=GETPOST('socid','int');
-$nom=GETPOST('nom');
+$label=GETPOST('label');
 $description=GETPOST('description');
 $visible=GETPOST('visible');
 $parent=GETPOST('parent');
@@ -107,7 +107,7 @@ if ($action == 'add' && $user->rights->categorie->creer)
 
 	$object = new Categorie($db);
 
-	$object->label			= $nom;
+	$object->label			= $label;
 	$object->description	= $description;
 	$object->socid			= ($socid ? $socid : 'null');
 	$object->visible		= $visible;
@@ -191,6 +191,8 @@ if ($user->rights->categorie->creer)
 	 */
 	if ($action == 'create' || $_POST["addcat"] == 'addcat')
 	{
+		dol_set_focus('#label');
+		
 		print '<form action="'.$_SERVER['PHP_SELF'].'?type='.$type.'" method="POST">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="urlfrom" value="'.$urlfrom.'">';
@@ -198,7 +200,6 @@ if ($user->rights->categorie->creer)
 		print '<input type="hidden" name="addcat" value="addcat">';
 		print '<input type="hidden" name="id" value="'.GETPOST('origin').'">';
 		print '<input type="hidden" name="type" value="'.$type.'">';
-		print '<input type="hidden" name="nom" value="'.dol_escape_htmltag($nom).'">';
 		if ($origin) print '<input type="hidden" name="origin" value="'.$origin.'">';
 		if ($catorigin)	print '<input type="hidden" name="catorigin" value="'.$catorigin.'">';
 
@@ -210,7 +211,7 @@ if ($user->rights->categorie->creer)
 
 		// Ref
 		print '<tr>';
-		print '<td width="25%" class="fieldrequired">'.$langs->trans("Ref").'</td><td><input name="nom" size="25" value="'.$nom.'">';
+		print '<td width="25%" class="fieldrequired">'.$langs->trans("Ref").'</td><td><input id="label" name="label" size="25" value="'.$label.'">';
 		print'</td></tr>';
 
 		// Description
@@ -237,7 +238,8 @@ if ($user->rights->categorie->creer)
 	}
 }
 
-$db->close();
 
 llxFooter();
+
+$db->close();
 ?>

From 9e3497cff33916fbf01d45c38cb92726dfb859fb Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Tue, 19 Feb 2013 16:02:58 +0100
Subject: [PATCH 156/162] New: Add ES formated address country rule

---
 htdocs/core/lib/functions.lib.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 352e5d1384e..36cf943c51b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -673,7 +673,7 @@ function dol_get_fiche_end($notab=0)
 function dol_format_address($object)
 {
 	$ret='';
-	$countriesusingstate=array('US','IN','GB');
+	$countriesusingstate=array('US','IN','GB','ES');
 
 	// Address
 	$ret .= $object->address;
@@ -696,6 +696,16 @@ function dol_format_address($object)
 		}
 		if ($object->zip) $ret .= ($ret ? "\n" : '' ).$object->zip;
 	}
+	else if (in_array($object->country_code,array('ES'))) // title firstname name \n address lines \n zip town \n state \n country
+	{
+		$ret .= ($ret ? "\n" : '' ).$object->zip;
+		$ret .= ' '.$object->town;
+		if ($object->state && in_array($object->country_code,$countriesusingstate))
+		{
+			$ret.="\n".$object->state;
+		}
+	}
+	
 	else                                        		// Other: title firstname name \n address lines \n zip town \n country
 	{
 		$ret .= ($ret ? "\n" : '' ).$object->zip;

From 94d1f6e0c25c57cb1670234772ac32cb6fae1135 Mon Sep 17 00:00:00 2001
From: simnandez <jmenent@2byte.es>
Date: Tue, 19 Feb 2013 16:05:55 +0100
Subject: [PATCH 157/162] Fix: sourcecompany now works with state instead
 departement (deprecated) into build_address

---
 htdocs/core/lib/pdf.lib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index e07c660fddc..72bcfc58acb 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -265,7 +265,8 @@ function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$target
 	if ($mode == 'target' && ! is_object($targetcompany)) return -1;
 	if ($mode == 'delivery' && ! is_object($deliverycompany)) return -1;
 
-	if (! empty($sourcecompany->state_id) && empty($sourcecompany->departement)) $sourcecompany->departement=getState($sourcecompany->state_id);
+	if (! empty($sourcecompany->state_id) && empty($sourcecompany->departement)) $sourcecompany->departement=getState($sourcecompany->state_id); //TODO: Deprecated
+	if (! empty($sourcecompany->state_id) && empty($sourcecompany->state)) $sourcecompany->state=getState($sourcecompany->state_id);
 	if (! empty($targetcompany->state_id) && empty($targetcompany->departement)) $targetcompany->departement=getState($targetcompany->state_id);
 
 	if ($mode == 'source')

From 8c0fbe62f59ea7665e70b317cf9831edf0d61f04 Mon Sep 17 00:00:00 2001
From: frederic34 <fred@ubuntuserver.(none)>
Date: Tue, 19 Feb 2013 16:30:51 +0100
Subject: [PATCH 158/162] fix language holiday

---
 htdocs/langs/fr_FR/holiday.lang | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index ec4084bf7e3..58bbfb1337b 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -84,8 +84,8 @@ NewSoldeCP=Nouveau Solde
 alreadyCPexist=Une demande de congés à déjà été effectuée sur cette période.
 UserName=Nom Prénom
 Employee=Salarié
-FirstDayOfHoliday=Premier jour de congès
-LastDayOfHoliday=Dernier jour de congès
+FirstDayOfHoliday=Premier jour de congés
+LastDayOfHoliday=Dernier jour de congés
 
 ## Configuration du Module ##
 ConfCP=Configuration du module Congés
@@ -127,4 +127,4 @@ NoCPforMonth=Aucun congé ce mois-ci.
 Jours=jours
 nbJours=Nombre jours
 TitleAdminCP=Configuration des Congés
-Permission20001=Lire / Créer / modifier ses congès
+Permission20001=Lire / Créer / modifier ses congés

From da6daef83bb545602cf777a940ad94e4beac7755 Mon Sep 17 00:00:00 2001
From: frederic34 <frederic.france@free.fr>
Date: Tue, 19 Feb 2013 16:36:25 +0100
Subject: [PATCH 159/162] fix language holiday admin

---
 htdocs/langs/fr_FR/admin.lang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 21b25865c15..46df03e5c63 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -468,7 +468,7 @@ Module2900Name= GeoIPMaxmind
 Module2900Desc= Capacités de conversion GeoIP Maxmind 
 Module5000Name= Multi-société
 Module5000Desc= Permet de gérer plusieurs sociétés
-Module20000Name=Congès
+Module20000Name=Congés
 Module20000Desc=Déclaration et suivi des congès des employés
 Module50000Name=PayBox
 Module50000Desc=Module permettant d'offrir en ligne une page de paiement par carte de crédit avec PayBox

From 9ddd6215f8100f5fc600e5657d84a650a395f29d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 19 Feb 2013 20:15:30 +0100
Subject: [PATCH 160/162] Qual: Replace native code with jquery plugin
 treeview.

---
 htdocs/admin/menus/index.php                  |   6 +-
 htdocs/admin/menus/menu.js.php                | 225 -------
 htdocs/core/lib/treeview.lib.php              |  97 ++-
 .../plugins/jquerytreeview/changelog.md       |  36 ++
 .../jquerytreeview/jquery.treeview.async.js   | 108 ++++
 .../jquerytreeview/jquery.treeview.css        |  74 +++
 .../jquerytreeview/jquery.treeview.edit.js    |  37 ++
 .../plugins/jquerytreeview/jquery.treeview.js | 251 ++++++++
 .../jquery.treeview.sortable.js               | 378 +++++++++++
 .../jquery/plugins/jquerytreeview/readme.md   |  47 ++
 .../plugins/jquerytreeview/screenshot.png     | Bin 0 -> 2387 bytes
 .../jquery/plugins/jstree/jquery.cookie.js    |  50 --
 .../jquery/plugins/jstree/jquery.hotkeys.js   |  99 ---
 .../plugins/jstree/jquery.jstree.min.js       | 596 ------------------
 .../jquery/plugins/jstree/themes/apple/bg.jpg | Bin 331 -> 0 bytes
 .../jquery/plugins/jstree/themes/apple/d.png  | Bin 7765 -> 0 bytes
 .../jstree/themes/apple/dot_for_ie.gif        | Bin 43 -> 0 bytes
 .../plugins/jstree/themes/apple/style.css     |  61 --
 .../plugins/jstree/themes/apple/throbber.gif  | Bin 1849 -> 0 bytes
 .../plugins/jstree/themes/classic/d.gif       | Bin 3003 -> 0 bytes
 .../plugins/jstree/themes/classic/d.png       | Bin 7535 -> 0 bytes
 .../jstree/themes/classic/dot_for_ie.gif      | Bin 43 -> 0 bytes
 .../plugins/jstree/themes/classic/style.css   |  77 ---
 .../jstree/themes/classic/throbber.gif        | Bin 1849 -> 0 bytes
 .../plugins/jstree/themes/default-rtl/d.gif   | Bin 2872 -> 0 bytes
 .../plugins/jstree/themes/default-rtl/d.png   | Bin 7459 -> 0 bytes
 .../jstree/themes/default-rtl/dots.gif        | Bin 132 -> 0 bytes
 .../jstree/themes/default-rtl/style.css       |  84 ---
 .../jstree/themes/default-rtl/throbber.gif    | Bin 1849 -> 0 bytes
 .../plugins/jstree/themes/default/d.gif       | Bin 2944 -> 0 bytes
 .../plugins/jstree/themes/default/d.png       | Bin 7635 -> 0 bytes
 .../plugins/jstree/themes/default/style.css   |  74 ---
 .../jstree/themes/default/throbber.gif        | Bin 1849 -> 0 bytes
 htdocs/theme/amarok/style.css.php             |   2 +-
 htdocs/theme/auguria/style.css.php            |   2 +-
 htdocs/theme/bureau2crea/style.css.php        |   2 +-
 htdocs/theme/cameleo/style.css.php            |   2 +-
 htdocs/theme/eldy/style.css.php               | 111 +---
 htdocs/user/hierarchy.php                     | 250 ++++++++
 39 files changed, 1230 insertions(+), 1439 deletions(-)
 delete mode 100644 htdocs/admin/menus/menu.js.php
 create mode 100644 htdocs/includes/jquery/plugins/jquerytreeview/changelog.md
 create mode 100644 htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.async.js
 create mode 100644 htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.css
 create mode 100644 htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.edit.js
 create mode 100644 htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.js
 create mode 100644 htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.sortable.js
 create mode 100644 htdocs/includes/jquery/plugins/jquerytreeview/readme.md
 create mode 100644 htdocs/includes/jquery/plugins/jquerytreeview/screenshot.png
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/jquery.cookie.js
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/jquery.hotkeys.js
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/jquery.jstree.min.js
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/themes/apple/bg.jpg
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/themes/apple/d.png
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/themes/apple/dot_for_ie.gif
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/themes/apple/style.css
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/themes/apple/throbber.gif
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/themes/classic/d.gif
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/themes/classic/d.png
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/themes/classic/dot_for_ie.gif
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/themes/classic/style.css
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/themes/classic/throbber.gif
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/themes/default-rtl/d.gif
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/themes/default-rtl/d.png
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/themes/default-rtl/dots.gif
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/themes/default-rtl/style.css
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/themes/default-rtl/throbber.gif
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/themes/default/d.gif
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/themes/default/d.png
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/themes/default/style.css
 delete mode 100644 htdocs/includes/jquery/plugins/jstree/themes/default/throbber.gif
 create mode 100644 htdocs/user/hierarchy.php

diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index b31bf8b7afa..1fd5365e272 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -208,9 +208,11 @@ elseif ($action == 'confirm_delete' && $confirm == 'yes')
 
 $form=new Form($db);
 $formadmin=new FormAdmin($db);
-$arrayofjs=array('/admin/menus/menu.js.php?lang='.$langs->defaultlang);
 
-llxHeader('',$langs->trans("Menus"),'','',0,0,$arrayofjs);
+$arrayofjs=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js?lang='.$langs->defaultlang);
+$arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css?lang='.$langs->defaultlang);
+
+llxHeader('',$langs->trans("Menus"),'','',0,0,$arrayofjs,$arrayofcss);
 
 
 print_fiche_titre($langs->trans("Menus"),'','setup');
diff --git a/htdocs/admin/menus/menu.js.php b/htdocs/admin/menus/menu.js.php
deleted file mode 100644
index f5790a81bdb..00000000000
--- a/htdocs/admin/menus/menu.js.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?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/>.
- */
-
-/**
- *		\file       htdocs/admin/menus/menu.js.php
- *		\brief      File for js menu
- */
-
-
-//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
-//if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');	// Not disabled to increase speed. Language code is found on url.
-if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
-if (! defined('NOLOGIN'))         define('NOLOGIN',1);
-if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
-if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
-if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
-
-session_cache_limiter(FALSE);
-
-require_once '../../master.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
-
-// Define css type
-header('Content-type: application/javascript');
-// Important: Following code is to avoid page request by browser and PHP CPU at
-// each Dolibarr page access.
-if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
-else header('Cache-Control: no-cache');
-
-// On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1.
-if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); }
-
-if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang'));  // If language was forced on URL
-if (GETPOST('theme')) $conf->theme=GETPOST('theme');  // If theme was forced on URL
-$langs->load("main",0,0);
-?>
-
-
-// Tests pour navigateurs
-var OPE = (window.opera) ? true : false;
-var IE  = (document.all && !OPE) ? true : false;
-var MOZ = (!IE && !OPE) ? true : false;
-// -----------------------------------------------------
-// Fonction d'initialisation de l'arbre
-function arbre() {
-    // Choix de la balise contenant le texte. (strong par defaut).
-    balise = "STRONG";
-    // Presentation de l'arbre au depart : deployee ('yes') ou fermee ('no')
-    extend = "no";
-    // Textes du lien plier / deplier
-    plier_text = '<?php echo $langs->transnoentities("UndoExpandAll"); ?>';
-    plier_title = 'Replier tous les noeuds de l\'arbre'
-    deplier_text = '<?php echo $langs->transnoentities("ExpandAll"); ?>';
-    deplier_title = 'Deplier tous les noeuds de l\'arbre'
-    // Recuperation de tous les arbres de la page
-    uls = getElBy('ul','class','arbre');
-    for (uli=0;uli < uls.length;uli++)
-    {
-        ul = uls[uli];
-        linkSwitch(ul);
-        processULEL(ul);
-        plier(ul,'replier');
-    }
-
-}
-
-// -------------------------------------------------------
-// Creation des liens plier /deplier tout
-function linkSwitch(ul) {
-    var a=document.createElement('a');
-    a.setAttribute('href','#');
-    if (extend=='yes') {
-        a.appendChild(document.createTextNode(plier_text));
-        a.setAttribute('title',plier_title);
-    }
-    else {
-        a.appendChild(document.createTextNode(deplier_text));
-        a.setAttribute('title',deplier_title);
-    }
-    var parbre = document.createElement('p');
-    parbre.setAttribute('class','arbre-switch');
-    parbre.appendChild(a);
-    ul.parentNode.insertBefore(parbre,ul);
-    listenlink(ul);
-}
-// Gestion des Clics sur les liens plier / deplier tout
-function listenlink(ul) {
-    var link = ul.previousSibling.childNodes[0];
-    link.onclick = function() {
-        if (this.childNodes[0].nodeValue == plier_text) {
-            plier(ul,'replier');
-            this.childNodes[0].nodeValue = deplier_text;
-            this.setAttribute('title',deplier_title);
-        }
-        else {
-            plier(ul,'deplier');
-            this.childNodes[0].nodeValue = plier_text;
-            this.setAttribute('title',plier_title);
-        }
-        return false;
-    }
-}
-// Action Plier / deplier tout
-function plier(ul,act) {
-    for (var i=0; i < ul.childNodes.length; i++) {
-        var li = ul.childNodes[i];
-        if (li.nodeName == 'LI') {
-            for (var j=0; j < li.childNodes.length; j++) {
-                var child = li.childNodes[j];
-                if (child.nodeName==balise) {
-                    var strong = child;
-                }
-                if (child.nodeName=='UL') {
-                    if (act=='replier') {
-                        child.className='hide';
-                        strong.className='arbre-plier';
-                    }
-                    else {
-                        child.className='';
-                        strong.className='arbre-deplier';
-                    }
-                    var sub = child;
-                    plier(sub,act);
-                }
-            }
-        }
-    }
-}
-// ---------------------------------------------------------
-// Analyse de l'arbre
-function processULEL(ul) {
-    if (!ul.childNodes || ul.childNodes.length == 0) return;
-    // Iterate LIs
-    for (var itemi=0;itemi < ul.childNodes.length;itemi++) {
-        var item = ul.childNodes[itemi];
-        if (item.nodeName == "LI") {
-            // Contenu des balises LI
-            var a;
-            var subul;
-            subul = "";
-            for (var sitemi=0;sitemi < item.childNodes.length;sitemi++) {
-                // Uniquement pour moz-firefox
-                if (MOZ) {item.style.background = "";}
-                // Enfants des li : balise ou sous-ul
-                var sitem = item.childNodes[sitemi];
-                switch (sitem.nodeName) {
-                    case balise:
-                        a = sitem;
-                        break;
-                    case "UL":
-                        subul = sitem;
-                        if (extend != "yes") {sitem.className = 'hide';}
-                        processULEL(subul);
-                        break;
-                }
-            }
-            if (subul) {
-                if (extend!="yes") {
-                    a.className='arbre-plier';
-                }
-                else {
-                    a.className='arbre-deplier';
-                    subul.className='';
-
-                }
-                associateEL(a,subul);
-            }
-        }
-    }
-}
-// Swicth des noeuds
-function associateEL(a,ul) {
-    a.onclick = function () {
-        this.className = (ul.className=='hide') ? 'arbre-deplier' : 'arbre-plier';
-        ul.className = (ul.className=='hide') ? '' : 'hide';
-        return false;
-    }
-}
-// -----------------------------------------------------
-// Nom  : GetElBy(tag,attr,val)
-// By   : Rui Nibau
-// Date : aout 2005
-// Func : Tableau des elements 'tag' dont l'attribut 'attr' a la valeur 'val'.
-// -----------------------------------------------------
-function getElBy(tag,attr,val) {
-	var dbRes = [];
-	var dbEl = document.getElementsByTagName(tag);
-	for (e=0; e < dbEl.length; e++) {
-		if (attr == 'class') {if (dbEl[e].className==val) {dbRes.push(dbEl[e]);}}
-		else {if (dbEl[e].getAttribute(attr)==val) {dbRes.push(dbEl[e]);}}
-	}
-	return dbRes;
-}
-// -----------------------------------------------------
-// A l'affichage de la page, lancer la fonction arbre
-window.onload = function() {
-    arbre();
-}
-
-function imgDel(id)
-{
-	var delId='del'+id;
-
-		var imgDel = document.getElementById('del'+id);
-		if (imgDel != null) imgDel.style.display='block';
-
-	return true;
-}
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index 1fc02206b26..7f8ed742fc6 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2007      Patrick Raguin       <patrick.raguin@gmail.com>
- * Copyright (C) 2007-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2007-2012 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
@@ -23,6 +23,8 @@
  */
 
 
+// ------------------------------- Used by category tree view -----------------
+
 /**
  * Return if a child id is in descendance of parentid
  *
@@ -145,7 +147,7 @@ function tree_showpad(&$fulltree,$key,$silent=0)
 /**
  *  Show an element with correct offset
  *
- *  @param	array	$tab    	Array of all elements
+ *  @param	array	$tab    	Array of element
  *  @param  int	    $rang   	Level of offset
  *  @return	void
  */
@@ -153,62 +155,15 @@ function tree_showline($tab,$rang)
 {
 	global $conf, $rangLast, $idLast, $menu_handler;
 
-	if ($conf->use_javascript_ajax)
-	{
-		if($rang == $rangLast)
-		{
-			print '<script type="text/javascript">imgDel('.$idLast.');</script>';
-			//print '<a href="'.DOL_URL_ROOT.'/admin/menus/index.php?menu_handler=eldy&action=delete&menuId='.$idLast.'">aa</a>';
-		}
-		elseif($rang > $rangLast)
-		{
-
-			print '<li><ul>';
-
-		}
-		elseif($rang < $rangLast)
-		{
-			print '<script type="text/javascript">imgDel('.$idLast.')</script>';
-
-			for($i=$rang; $i < $rangLast; $i++)
-			{
-				print '</ul></li>';
-				echo "\n";
-			}
-
-		}
-	}
-	else
-	{
-		if($rang > $rangLast)
-		{
-
-			print '<li><ul>';
-
-		}
-		elseif($rang < $rangLast)
-		{
-
-			for($i=$rang; $i < $rangLast; $i++)
-			{
-				print '</ul></li>';
-				echo "\n";
-			}
-
-		}
-	}
-
-	print '<li id=li'.$tab['rowid'].'>';
-
 	// Content of line
-	print '<strong> &nbsp;<a href="edit.php?menu_handler='.$menu_handler.'&action=edit&menuId='.$tab['rowid'].'">'.$tab['title'].'</a></strong>';
-	print '<div class="menuEdit"><a href="edit.php?menu_handler='.$menu_handler.'&action=edit&menuId='.$tab['rowid'].'">'.img_edit('default',0,'class="menuEdit" id="edit'.$tab['rowid'].'"').'</a></div>';
-	print '<div class="menuNew"><a href="edit.php?menu_handler='.$menu_handler.'&action=create&menuId='.$tab['rowid'].'">'.img_edit_add('default',0,'class="menuNew" id="new'.$tab['rowid'].'"').'</a></div>';
-	print '<div class="menuDel"><a href="index.php?menu_handler='.$menu_handler.'&action=delete&menuId='.$tab['rowid'].'">'.img_delete('default',0,'class="menuDel" id="del'.$tab['rowid'].'"').'</a></div>';
-	print '<div class="menuFleche"><a href="index.php?menu_handler='.$menu_handler.'&action=up&menuId='.$tab['rowid'].'">'.img_picto("Monter","1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler.'&action=down&menuId='.$tab['rowid'].'">'.img_picto("Descendre","1downarrow").'</a></div>';
-
-	print '</li>';
-	echo "\n";
+	print '<table class="nobordernopadding centpercent"><tr><td>';
+	print '<strong> &nbsp; <a href="edit.php?menu_handler='.$menu_handler.'&action=edit&menuId='.$tab['rowid'].'">'.$tab['title'].'</a></strong>';
+	print '</td><td align="right">';
+	print '<a href="edit.php?menu_handler='.$menu_handler.'&action=edit&menuId='.$tab['rowid'].'">'.img_edit('default',0,'class="menuEdit" id="edit'.$tab['rowid'].'"').'</a> ';
+	print '<a href="edit.php?menu_handler='.$menu_handler.'&action=create&menuId='.$tab['rowid'].'">'.img_edit_add('default',0,'class="menuNew" id="new'.$tab['rowid'].'"').'</a> ';
+	print '<a href="index.php?menu_handler='.$menu_handler.'&action=delete&menuId='.$tab['rowid'].'">'.img_delete('default',0,'class="menuDel" id="del'.$tab['rowid'].'"').'</a> ';
+	print '<a href="index.php?menu_handler='.$menu_handler.'&action=up&menuId='.$tab['rowid'].'">'.img_picto("Monter","1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler.'&action=down&menuId='.$tab['rowid'].'">'.img_picto("Descendre","1downarrow").'</a>';
+	print '</td></tr></table>';
 
 	$rangLast = $rang;
 	$idLast = $tab['rowid'];
@@ -218,41 +173,63 @@ function tree_showline($tab,$rang)
 /**
  *  Recursive function to output menu tree
  *
- *  @param	array	$tab    Array of elements
+ *  @param	array	$tab    Array of all elements
  *  @param  int	    $pere   Array with parent ids ('rowid'=>,'mainmenu'=>,'leftmenu'=>,'fk_mainmenu=>,'fk_leftmenu=>)
  *  @param  int	    $rang   Level of element
  *  @return	void
  */
 function tree_recur($tab,$pere,$rang)
 {
-	if (empty($pere['rowid'])) print '<ul class="arbre">';
+	if (empty($pere['rowid'])) 
+	{
+		// Test also done with jstree and dynatree (not able to have <a> inside label) 
+		print '<script type="text/javascript" language="javascript">
+		$(document).ready(function(){
+			$("#iddivjstree").treeview({
+				collapsed: true,
+				animated: "fast",
+				persist: "location"
+			});
+		})
+		</script>';
+		
+		print '<ul id="iddivjstree" style="min-height:300px;">';
+	}
 
 	if ($rang > 10)	return;	// Protection contre boucle infinie
 
 	//ballayage du tableau
 	$sizeoftab=count($tab);
+	$ulprinted=0;
 	for ($x=0; $x < $sizeoftab; $x++)
 	{
 		//var_dump($tab[$x]);exit;
 		// If an element has $pere for parent
 		if ($tab[$x]['fk_menu'] != -1 && $tab[$x]['fk_menu'] == $pere['rowid'])
 		{
+			if (empty($ulprinted) && ! empty($pere['rowid'])) { print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++; } 
+			print "\n".'<li>';
 			// We shot it with an offset
 			tree_showline($tab[$x],$rang);
 
 			// And now we search all its sons of lower level
 			tree_recur($tab,$tab[$x],$rang+1);
+			print '</li>';
 		}
 		elseif (! empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
 		{
+			if (empty($ulprinted) && ! empty($pere['rowid'])) { print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++; } 
+			print "\n".'<li>';
 			// We shot it with an offset
 			tree_showline($tab[$x],$rang);
 
 			// And now we search all its sons of lower level
 			tree_recur($tab,$tab[$x],$rang+1);
+			print '</li>';
 		}
 	}
-
+	if (! empty($ulprinted) && ! empty($pere['rowid'])) { print '</ul>'."\n"; }
+	
 	if (empty($pere['rowid'])) print '</ul>';
 }
 
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/changelog.md b/htdocs/includes/jquery/plugins/jquerytreeview/changelog.md
new file mode 100644
index 00000000000..29c6e1975d2
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/jquerytreeview/changelog.md
@@ -0,0 +1,36 @@
+1.4.1
+-----
+* Fix for #2360
+* Added option cookieOptions: Passed through to $.cookie to set path, domain etc.
+* Tested with jQuery 1.2.x and 1.4.3
+* Fixed combination of persist: "location" and prerendered: true
+
+1.4
+---
+
+* Added changelog (this file)
+* Fixed tree control to search only for anchors, allowing images or other elements inside the controls, while keeping the control usable with the keyboard
+* Restructured folder layout: root contains plugin resources, lib contains script dependencies, demo contains demos and related files
+* Added prerendered option: If set to true, assumes all hitarea divs and classes already rendered, speeding up initialization for big trees, but more obtrusive
+* Added jquery.treeview.async.js for ajax-lazy-loading trees, see async.html demo
+* Exposed $.fn.treeview.classes for custom classes if necessary
+* Show treecontrol only when JavaScript is enabled
+* Completely reworked themeing via CSS sprites, resulting in only two files per theme
+  * updated dotted, black, gray and red theme
+  * added famfamfam theme (no lines)
+* Improved cookie persistence to allow multiple persisted trees per page via cookieId option
+* Improved location persistence by making it case-insensitive
+* Improved swapClass and replaceClass plugin implementations
+* Added folder-closed.gif to filetree example
+
+1.3
+---
+
+* Fixes for all outstanding bugs
+* Added persistence features
+      * location based: click on a link in the treeview and reopen that link after the page loaded
+      * cookie based: save the state of the tree in a cookie on each click and load that on reload
+* smoothed animations, fixing flickering in both IE and Opera
+* Tested in Firefox 2, IE 6 & 7, Opera 9, Safari 3
+* Moved documentation to jQuery wiki
+* Requires jQuery 1.2+
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.async.js b/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.async.js
new file mode 100644
index 00000000000..36e368a0737
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.async.js
@@ -0,0 +1,108 @@
+/*
+ * Async Treeview 0.1 - Lazy-loading extension for Treeview
+ *
+ * http://bassistance.de/jquery-plugins/jquery-plugin-treeview/
+ *
+ * Copyright 2010 Jörn Zaefferer
+ * Released under the MIT license:
+ *   http://www.opensource.org/licenses/mit-license.php
+ */
+
+;(function($) {
+
+function load(settings, root, child, container) {
+	function createNode(parent) {
+		var current = $("<li/>").attr("id", this.id || "").html("<span>" + this.text + "</span>").appendTo(parent);
+		if (this.classes) {
+			current.children("span").addClass(this.classes);
+		}
+		if (this.expanded) {
+			current.addClass("open");
+		}
+		if (this.hasChildren || this.children && this.children.length) {
+			var branch = $("<ul/>").appendTo(current);
+			if (this.hasChildren) {
+				current.addClass("hasChildren");
+				createNode.call({
+					classes: "placeholder",
+					text: "&nbsp;",
+					children:[]
+				}, branch);
+			}
+			if (this.children && this.children.length) {
+				$.each(this.children, createNode, [branch])
+			}
+		}
+	}
+	$.ajax($.extend(true, {
+		url: settings.url,
+		dataType: "json",
+		data: {
+			root: root
+		},
+		success: function(response) {
+			child.empty();
+			$.each(response, createNode, [child]);
+	        $(container).treeview({add: child});
+	    }
+	}, settings.ajax));
+	/*
+	$.getJSON(settings.url, {root: root}, function(response) {
+		function createNode(parent) {
+			var current = $("<li/>").attr("id", this.id || "").html("<span>" + this.text + "</span>").appendTo(parent);
+			if (this.classes) {
+				current.children("span").addClass(this.classes);
+			}
+			if (this.expanded) {
+				current.addClass("open");
+			}
+			if (this.hasChildren || this.children && this.children.length) {
+				var branch = $("<ul/>").appendTo(current);
+				if (this.hasChildren) {
+					current.addClass("hasChildren");
+					createNode.call({
+						classes: "placeholder",
+						text: "&nbsp;",
+						children:[]
+					}, branch);
+				}
+				if (this.children && this.children.length) {
+					$.each(this.children, createNode, [branch])
+				}
+			}
+		}
+		child.empty();
+		$.each(response, createNode, [child]);
+        $(container).treeview({add: child});
+    });
+    */
+}
+
+var proxied = $.fn.treeview;
+$.fn.treeview = function(settings) {
+	if (!settings.url) {
+		return proxied.apply(this, arguments);
+	}
+	if (!settings.root) {
+		settings.root = "source";
+	}
+	var container = this;
+	if (!container.children().size())
+		load(settings, settings.root, this, container);
+	var userToggle = settings.toggle;
+	return proxied.call(this, $.extend({}, settings, {
+		collapsed: true,
+		toggle: function() {
+			var $this = $(this);
+			if ($this.hasClass("hasChildren")) {
+				var childList = $this.removeClass("hasChildren").find("ul");
+				load(settings, this.id, childList, container);
+			}
+			if (userToggle) {
+				userToggle.apply(this, arguments);
+			}
+		}
+	}));
+};
+
+})(jQuery);
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.css b/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.css
new file mode 100644
index 00000000000..298672be907
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.css
@@ -0,0 +1,74 @@
+.treeview, .treeview ul {
+	padding: 0;
+	margin: 0;
+	list-style: none;
+}
+
+.treeview ul {
+	background-color: white;
+	margin-top: 4px;
+}
+
+.treeview .hitarea {
+	background: url(images/treeview-default.gif) -64px -25px no-repeat;
+	height: 16px;
+	width: 16px;
+	margin-left: -16px;
+	float: left;
+	cursor: pointer;
+}
+/* fix for IE6 */
+* html .hitarea {
+	display: inline;
+	float:none;
+}
+
+.treeview li {
+	margin: 0;
+	padding: 3px 0pt 3px 16px;
+}
+
+.treeview a.selected {
+	background-color: #eee;
+}
+
+#treecontrol { margin: 1em 0; display: none; }
+
+.treeview .hover { color: red; cursor: pointer; }
+
+.treeview li { background: url(images/treeview-default-line.gif) 0 0 no-repeat; }
+.treeview li.collapsable, .treeview li.expandable { background-position: 0 -176px; }
+
+.treeview .expandable-hitarea { background-position: -80px -3px; }
+
+.treeview li.last { background-position: 0 -1766px }
+.treeview li.lastCollapsable, .treeview li.lastExpandable { background-image: url(images/treeview-default.gif); }
+.treeview li.lastCollapsable { background-position: 0 -111px }
+.treeview li.lastExpandable { background-position: -32px -67px }
+
+.treeview div.lastCollapsable-hitarea, .treeview div.lastExpandable-hitarea { background-position: 0; }
+
+.treeview-red li { background-image: url(images/treeview-red-line.gif); }
+.treeview-red .hitarea, .treeview-red li.lastCollapsable, .treeview-red li.lastExpandable { background-image: url(images/treeview-red.gif); }
+
+.treeview-black li { background-image: url(images/treeview-black-line.gif); }
+.treeview-black .hitarea, .treeview-black li.lastCollapsable, .treeview-black li.lastExpandable { background-image: url(images/treeview-black.gif); }
+
+.treeview-gray li { background-image: url(images/treeview-gray-line.gif); }
+.treeview-gray .hitarea, .treeview-gray li.lastCollapsable, .treeview-gray li.lastExpandable { background-image: url(images/treeview-gray.gif); }
+
+.treeview-famfamfam li { background-image: url(images/treeview-famfamfam-line.gif); }
+.treeview-famfamfam .hitarea, .treeview-famfamfam li.lastCollapsable, .treeview-famfamfam li.lastExpandable { background-image: url(images/treeview-famfamfam.gif); }
+
+.treeview .placeholder {
+	background: url(images/ajax-loader.gif) 0 0 no-repeat;
+	height: 16px;
+	width: 16px;
+	display: block;
+}
+
+.filetree li { padding: 3px 0 2px 16px; }
+.filetree span.folder, .filetree span.file { padding: 1px 0 1px 16px; display: block; }
+.filetree span.folder { background: url(images/folder.gif) 0 0 no-repeat; }
+.filetree li.expandable span.folder { background: url(images/folder-closed.gif) 0 0 no-repeat; }
+.filetree span.file { background: url(images/file.gif) 0 0 no-repeat; }
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.edit.js b/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.edit.js
new file mode 100644
index 00000000000..6aea29659fb
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.edit.js
@@ -0,0 +1,37 @@
+(function($) {
+	var CLASSES = $.treeview.classes;
+	var proxied = $.fn.treeview;
+	$.fn.treeview = function(settings) {
+		settings = $.extend({}, settings);
+		if (settings.add) {
+			return this.trigger("add", [settings.add]);
+		}
+		if (settings.remove) {
+			return this.trigger("remove", [settings.remove]);
+		}
+		return proxied.apply(this, arguments).bind("add", function(event, branches) {
+			$(branches).prev()
+				.removeClass(CLASSES.last)
+				.removeClass(CLASSES.lastCollapsable)
+				.removeClass(CLASSES.lastExpandable)
+			.find(">.hitarea")
+				.removeClass(CLASSES.lastCollapsableHitarea)
+				.removeClass(CLASSES.lastExpandableHitarea);
+			$(branches).find("li").andSelf().prepareBranches(settings).applyClasses(settings, $(this).data("toggler"));
+		}).bind("remove", function(event, branches) {
+			var prev = $(branches).prev();
+			var parent = $(branches).parent();
+			$(branches).remove();
+			prev.filter(":last-child").addClass(CLASSES.last)
+				.filter("." + CLASSES.expandable).replaceClass(CLASSES.last, CLASSES.lastExpandable).end()
+				.find(">.hitarea").replaceClass(CLASSES.expandableHitarea, CLASSES.lastExpandableHitarea).end()
+				.filter("." + CLASSES.collapsable).replaceClass(CLASSES.last, CLASSES.lastCollapsable).end()
+				.find(">.hitarea").replaceClass(CLASSES.collapsableHitarea, CLASSES.lastCollapsableHitarea);
+			if (parent.is(":not(:has(>))") && parent[0] != this) {
+				parent.parent().removeClass(CLASSES.collapsable).removeClass(CLASSES.expandable)
+				parent.siblings(".hitarea").andSelf().remove();
+			}
+		});
+	};
+
+})(jQuery);
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.js b/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.js
new file mode 100644
index 00000000000..030a7be67a5
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.js
@@ -0,0 +1,251 @@
+/*
+ * Treeview 1.5pre - jQuery plugin to hide and show branches of a tree
+ *
+ * http://bassistance.de/jquery-plugins/jquery-plugin-treeview/
+ * http://docs.jquery.com/Plugins/Treeview
+ *
+ * Copyright 2010 Jörn Zaefferer
+ * Released under the MIT license:
+ *   http://www.opensource.org/licenses/mit-license.php
+ */
+
+;(function($) {
+
+	// TODO rewrite as a widget, removing all the extra plugins
+	$.extend($.fn, {
+		swapClass: function(c1, c2) {
+			var c1Elements = this.filter('.' + c1);
+			this.filter('.' + c2).removeClass(c2).addClass(c1);
+			c1Elements.removeClass(c1).addClass(c2);
+			return this;
+		},
+		replaceClass: function(c1, c2) {
+			return this.filter('.' + c1).removeClass(c1).addClass(c2).end();
+		},
+		hoverClass: function(className) {
+			className = className || "hover";
+			return this.hover(function() {
+				$(this).addClass(className);
+			}, function() {
+				$(this).removeClass(className);
+			});
+		},
+		heightToggle: function(animated, callback) {
+			animated ?
+				this.animate({ height: "toggle" }, animated, callback) :
+				this.each(function(){
+					jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]();
+					if(callback)
+						callback.apply(this, arguments);
+				});
+		},
+		heightHide: function(animated, callback) {
+			if (animated) {
+				this.animate({ height: "hide" }, animated, callback);
+			} else {
+				this.hide();
+				if (callback)
+					this.each(callback);
+			}
+		},
+		prepareBranches: function(settings) {
+			if (!settings.prerendered) {
+				// mark last tree items
+				this.filter(":last-child:not(ul)").addClass(CLASSES.last);
+				// collapse whole tree, or only those marked as closed, anyway except those marked as open
+				this.filter((settings.collapsed ? "" : "." + CLASSES.closed) + ":not(." + CLASSES.open + ")").find(">ul").hide();
+			}
+			// return all items with sublists
+			return this.filter(":has(>ul)");
+		},
+		applyClasses: function(settings, toggler) {
+			// TODO use event delegation
+			this.filter(":has(>ul):not(:has(>a))").find(">span").unbind("click.treeview").bind("click.treeview", function(event) {
+				// don't handle click events on children, eg. checkboxes
+				if ( this == event.target )
+					toggler.apply($(this).next());
+			}).add( $("a", this) ).hoverClass();
+
+			if (!settings.prerendered) {
+				// handle closed ones first
+				this.filter(":has(>ul:hidden)")
+						.addClass(CLASSES.expandable)
+						.replaceClass(CLASSES.last, CLASSES.lastExpandable);
+
+				// handle open ones
+				this.not(":has(>ul:hidden)")
+						.addClass(CLASSES.collapsable)
+						.replaceClass(CLASSES.last, CLASSES.lastCollapsable);
+
+	            // create hitarea if not present
+				var hitarea = this.find("div." + CLASSES.hitarea);
+				if (!hitarea.length)
+					hitarea = this.prepend("<div class=\"" + CLASSES.hitarea + "\"/>").find("div." + CLASSES.hitarea);
+				hitarea.removeClass().addClass(CLASSES.hitarea).each(function() {
+					var classes = "";
+					$.each($(this).parent().attr("class").split(" "), function() {
+						classes += this + "-hitarea ";
+					});
+					$(this).addClass( classes );
+				})
+			}
+
+			// apply event to hitarea
+			this.find("div." + CLASSES.hitarea).click( toggler );
+		},
+		treeview: function(settings) {
+
+			settings = $.extend({
+				cookieId: "treeview"
+			}, settings);
+
+			if ( settings.toggle ) {
+				var callback = settings.toggle;
+				settings.toggle = function() {
+					return callback.apply($(this).parent()[0], arguments);
+				};
+			}
+
+			// factory for treecontroller
+			function treeController(tree, control) {
+				// factory for click handlers
+				function handler(filter) {
+					return function() {
+						// reuse toggle event handler, applying the elements to toggle
+						// start searching for all hitareas
+						toggler.apply( $("div." + CLASSES.hitarea, tree).filter(function() {
+							// for plain toggle, no filter is provided, otherwise we need to check the parent element
+							return filter ? $(this).parent("." + filter).length : true;
+						}) );
+						return false;
+					};
+				}
+				// click on first element to collapse tree
+				$("a:eq(0)", control).click( handler(CLASSES.collapsable) );
+				// click on second to expand tree
+				$("a:eq(1)", control).click( handler(CLASSES.expandable) );
+				// click on third to toggle tree
+				$("a:eq(2)", control).click( handler() );
+			}
+
+			// handle toggle event
+			function toggler() {
+				$(this)
+					.parent()
+					// swap classes for hitarea
+					.find(">.hitarea")
+						.swapClass( CLASSES.collapsableHitarea, CLASSES.expandableHitarea )
+						.swapClass( CLASSES.lastCollapsableHitarea, CLASSES.lastExpandableHitarea )
+					.end()
+					// swap classes for parent li
+					.swapClass( CLASSES.collapsable, CLASSES.expandable )
+					.swapClass( CLASSES.lastCollapsable, CLASSES.lastExpandable )
+					// find child lists
+					.find( ">ul" )
+					// toggle them
+					.heightToggle( settings.animated, settings.toggle );
+				if ( settings.unique ) {
+					$(this).parent()
+						.siblings()
+						// swap classes for hitarea
+						.find(">.hitarea")
+							.replaceClass( CLASSES.collapsableHitarea, CLASSES.expandableHitarea )
+							.replaceClass( CLASSES.lastCollapsableHitarea, CLASSES.lastExpandableHitarea )
+						.end()
+						.replaceClass( CLASSES.collapsable, CLASSES.expandable )
+						.replaceClass( CLASSES.lastCollapsable, CLASSES.lastExpandable )
+						.find( ">ul" )
+						.heightHide( settings.animated, settings.toggle );
+				}
+			}
+			this.data("toggler", toggler);
+
+			function serialize() {
+				function binary(arg) {
+					return arg ? 1 : 0;
+				}
+				var data = [];
+				branches.each(function(i, e) {
+					data[i] = $(e).is(":has(>ul:visible)") ? 1 : 0;
+				});
+				$.cookie(settings.cookieId, data.join(""), settings.cookieOptions );
+			}
+
+			function deserialize() {
+				var stored = $.cookie(settings.cookieId);
+				if ( stored ) {
+					var data = stored.split("");
+					branches.each(function(i, e) {
+						$(e).find(">ul")[ parseInt(data[i]) ? "show" : "hide" ]();
+					});
+				}
+			}
+
+			// add treeview class to activate styles
+			this.addClass("treeview");
+
+			// prepare branches and find all tree items with child lists
+			var branches = this.find("li").prepareBranches(settings);
+
+			switch(settings.persist) {
+			case "cookie":
+				var toggleCallback = settings.toggle;
+				settings.toggle = function() {
+					serialize();
+					if (toggleCallback) {
+						toggleCallback.apply(this, arguments);
+					}
+				};
+				deserialize();
+				break;
+			case "location":
+				var current = this.find("a").filter(function() {
+					return this.href.toLowerCase() == location.href.toLowerCase();
+				});
+				if ( current.length ) {
+					// TODO update the open/closed classes
+					var items = current.addClass("selected").parents("ul, li").add( current.next() ).show();
+					if (settings.prerendered) {
+						// if prerendered is on, replicate the basic class swapping
+						items.filter("li")
+							.swapClass( CLASSES.collapsable, CLASSES.expandable )
+							.swapClass( CLASSES.lastCollapsable, CLASSES.lastExpandable )
+							.find(">.hitarea")
+								.swapClass( CLASSES.collapsableHitarea, CLASSES.expandableHitarea )
+								.swapClass( CLASSES.lastCollapsableHitarea, CLASSES.lastExpandableHitarea );
+					}
+				}
+				break;
+			}
+
+			branches.applyClasses(settings, toggler);
+
+			// if control option is set, create the treecontroller and show it
+			if ( settings.control ) {
+				treeController(this, settings.control);
+				$(settings.control).show();
+			}
+
+			return this;
+		}
+	});
+
+	// classes used by the plugin
+	// need to be styled via external stylesheet, see first example
+	$.treeview = {};
+	var CLASSES = ($.treeview.classes = {
+		open: "open",
+		closed: "closed",
+		expandable: "expandable",
+		expandableHitarea: "expandable-hitarea",
+		lastExpandableHitarea: "lastExpandable-hitarea",
+		collapsable: "collapsable",
+		collapsableHitarea: "collapsable-hitarea",
+		lastCollapsableHitarea: "lastCollapsable-hitarea",
+		lastCollapsable: "lastCollapsable",
+		lastExpandable: "lastExpandable",
+		last: "last",
+		hitarea: "hitarea"
+	});
+
+})(jQuery);
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.sortable.js b/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.sortable.js
new file mode 100644
index 00000000000..40dab0dc454
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/jquerytreeview/jquery.treeview.sortable.js
@@ -0,0 +1,378 @@
+/*
+ * jQuery UI Sortable
+ *
+ * Copyright (c) 2008 Paul Bakaus
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Sortables
+ *
+ * Depends:
+ *   ui.base.js
+ *
+ * Revision: $Id: ui.sortable.js 5262 2008-04-17 13:13:51Z paul.bakaus $
+ */
+;(function($) {
+
+	if (window.Node && Node.prototype && !Node.prototype.contains) {
+		Node.prototype.contains = function (arg) {
+			return !!(this.compareDocumentPosition(arg) & 16);
+		};
+	}
+
+
+	$.widget("ui.sortableTree", $.extend($.ui.mouse, {
+		init: function() {
+
+			//Initialize needed constants
+			var self = this, o = this.options;
+			this.containerCache = {};
+			this.element.addClass("ui-sortableTree");
+
+			//Get the items
+			this.refresh();
+
+			//Let's determine the parent's offset
+			if(!(/(relative|absolute|fixed)/).test(this.element.css('position'))) this.element.css('position', 'relative');
+			this.offset = this.element.offset();
+
+			//Initialize mouse events for interaction
+			this.mouseInit();
+
+			//Prepare cursorAt
+			if(o.cursorAt && o.cursorAt.constructor == Array)
+				o.cursorAt = { left: o.cursorAt[0], top: o.cursorAt[1] };
+
+		},
+		plugins: {},
+		ui: function(inst) {
+			return {
+				helper: (inst || this)["helper"],
+				position: (inst || this)["position"].current,
+				absolutePosition: (inst || this)["position"].absolute,
+				instance: this,
+				options: this.options,
+				element: this.element,
+				item: (inst || this)["currentItem"],
+				sender: inst ? inst.element : null
+			};
+		},
+		propagate: function(n,e,inst) {
+			$.ui.plugin.call(this, n, [e, this.ui(inst)]);
+			this.element.triggerHandler(n == "sort" ? n : "sort"+n, [e, this.ui(inst)], this.options[n]);
+		},
+		serialize: function(o) {
+
+			var items = $(this.options.items, this.element).not('.ui-sortableTree-helper'); //Only the items of the sortable itself
+			var str = []; o = o || {};
+
+			items.each(function() {
+				var res = ($(this).attr(o.attribute || 'id') || '').match(o.expression || (/(.+)[-=_](.+)/));
+				if(res) str.push((o.key || res[1])+'[]='+(o.key ? res[1] : res[2]));
+			});
+
+			return str.join('&');
+
+		},
+		toArray: function(attr) {
+			var items = $(this.options.items, this.element).not('.ui-sortableTree-helper'); //Only the items of the sortable itself
+			var ret = [];
+
+			items.each(function() { ret.push($(this).attr(attr || 'id')); });
+			return ret;
+		},
+		enable: function() {
+			this.element.removeClass("ui-sortableTree-disabled");
+			this.options.disabled = false;
+		},
+		disable: function() {
+			this.element.addClass("ui-sortableTree-disabled");
+			this.options.disabled = true;
+		},
+		/* Be careful with the following core functions */
+		intersectsWith: function(item) {
+
+			var x1 = this.position.absolute.left - 10, x2 = x1 + 10,
+			    y1 = this.position.absolute.top - 10, y2 = y1 + 10;
+			var l = item.left, r = l + item.width,
+			    t = item.top,  b = t + item.height;
+
+			return (   l < x1 + (this.helperProportions.width  / 2)    // Right Half
+				&&     x2 - (this.helperProportions.width  / 2) < r    // Left Half
+				&& t < y1 + (this.helperProportions.height / 2)        // Bottom Half
+				&&     y2 - (this.helperProportions.height / 2) < b ); // Top Half
+
+		},
+		intersectsWithEdge: function(item) {
+			var y1 = this.position.absolute.top - 10, y2 = y1 + 10;
+			var t = item.top,  b = t + item.height;
+
+			if(!this.intersectsWith(item.item.parents(".ui-sortableTree").data("sortableTree").containerCache)) return false;
+
+			if (!( t < y1 + (this.helperProportions.height / 2)        // Bottom Half
+				&&     y2 - (this.helperProportions.height / 2) < b )) return false; // Top Half
+
+			if(y2 > t && y1 < t) return 1; //Crosses top edge
+			if(y1 < b && y2 > b) return 2; //Crosses bottom edge
+
+			return false;
+
+		},
+		refresh: function() {
+			this.refreshItems();
+			this.refreshPositions();
+		},
+		refreshItems: function() {
+
+			this.items = [];
+			this.containers = [this];
+			var items = this.items;
+			var queries = [$(this.options.items, this.element)];
+
+			if(this.options.connectWith) {
+				for (var i = this.options.connectWith.length - 1; i >= 0; i--){
+					var cur = $(this.options.connectWith[i]);
+					for (var j = cur.length - 1; j >= 0; j--){
+						var inst = $.data(cur[j], 'sortableTree');
+						if(inst && !inst.options.disabled) {
+							queries.push($(inst.options.items, inst.element));
+							this.containers.push(inst);
+						}
+					};
+				};
+			}
+
+			for (var i = queries.length - 1; i >= 0; i--){
+				queries[i].each(function() {
+					$.data(this, 'sortableTree-item', true); // Data for target checking (mouse manager)
+					items.push({
+						item: $(this),
+						width: 0, height: 0,
+						left: 0, top: 0
+					});
+				});
+			};
+
+		},
+		refreshPositions: function(fast) {
+			for (var i = this.items.length - 1; i >= 0; i--){
+				if(!fast) this.items[i].height 			= this.items[i].item.outerHeight();
+				this.items[i].top 						= this.items[i].item.offset().top;
+			};
+			for (var i = this.containers.length - 1; i >= 0; i--){
+				var p =this.containers[i].element.offset();
+				this.containers[i].containerCache.left 	= p.left;
+				this.containers[i].containerCache.top 	= p.top;
+				this.containers[i].containerCache.width	= this.containers[i].element.outerWidth();
+				this.containers[i].containerCache.height= this.containers[i].element.outerHeight();
+			};
+		},
+		destroy: function() {
+
+			this.element
+				.removeClass("ui-sortableTree ui-sortableTree-disabled")
+				.removeData("sortableTree")
+				.unbind(".sortableTree");
+			this.mouseDestroy();
+
+			for ( var i = this.items.length - 1; i >= 0; i-- )
+				this.items[i].item.removeData("sortableTree-item");
+
+		},
+		contactContainers: function(e) {
+			for (var i = this.containers.length - 1; i >= 0; i--){
+
+				if(this.intersectsWith(this.containers[i].containerCache)) {
+					if(!this.containers[i].containerCache.over) {
+
+						if(this.currentContainer != this.containers[i]) {
+
+							//When entering a new container, we will find the item with the least distance and append our item near it
+							var dist = 10000; var itemWithLeastDistance = null; var base = this.position.absolute.top;
+							for (var j = this.items.length - 1; j >= 0; j--) {
+								if(!this.containers[i].element[0].contains(this.items[j].item[0])) continue;
+								var cur = this.items[j].top;
+								if(Math.abs(cur - base) < dist) {
+									dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j];
+								}
+							}
+
+							itemWithLeastDistance ? this.rearrange(e, itemWithLeastDistance) : this.rearrange(e, null, this.containers[i].element);
+							this.propagate("change", e); //Call plugins and callbacks
+							this.containers[i].propagate("change", e, this); //Call plugins and callbacks
+							this.currentContainer = this.containers[i];
+
+						}
+
+						this.containers[i].propagate("over", e, this);
+						this.containers[i].containerCache.over = 1;
+					}
+				} else {
+					if(this.containers[i].containerCache.over) {
+						this.containers[i].propagate("out", e, this);
+						this.containers[i].containerCache.over = 0;
+					}
+				}
+
+			};
+		},
+		mouseStart: function(e,el) {
+
+			if(this.options.disabled || this.options.type == 'static') return false;
+
+			//Find out if the clicked node (or one of its parents) is a actual item in this.items
+			var currentItem = null, nodes = $(e.target).parents().each(function() {
+				if($.data(this, 'sortableTree-item')) {
+					currentItem = $(this);
+					return false;
+				}
+			});
+			if($.data(e.target, 'sortableTree-item')) currentItem = $(e.target);
+
+			if(!currentItem) return false;
+			if(this.options.handle) {
+				var validHandle = false;
+				$(this.options.handle, currentItem).each(function() { if(this == e.target) validHandle = true; });
+				if(!validHandle) return false;
+			}
+
+			this.currentItem = currentItem;
+
+			var o = this.options;
+			this.currentContainer = this;
+			this.refresh();
+
+			//Create and append the visible helper
+			this.helper = typeof o.helper == 'function' ? $(o.helper.apply(this.element[0], [e, this.currentItem])) : this.currentItem.clone();
+			if(!this.helper.parents('body').length) this.helper.appendTo("body"); //Add the helper to the DOM if that didn't happen already
+			this.helper.css({ position: 'absolute', clear: 'both' }).addClass('ui-sortableTree-helper'); //Position it absolutely and add a helper class
+
+			//Prepare variables for position generation
+			$.extend(this, {
+				offsetParent: this.helper.offsetParent(),
+				offsets: { absolute: this.currentItem.offset() }
+			});
+
+			//Save the first time position
+			$.extend(this, {
+				position: {
+					current: { left: e.pageX, top: e.pageY },
+					absolute: { left: e.pageX, top: e.pageY },
+					dom: this.currentItem.prev()[0]
+				},
+				clickOffset: { left: -5, top: -5 }
+			});
+
+			this.propagate("start", e); //Call plugins and callbacks
+			this.helperProportions = { width: this.helper.outerWidth(), height: this.helper.outerHeight() }; //Save and store the helper proportions
+
+			for (var i = this.containers.length - 1; i >= 0; i--) {
+				this.containers[i].propagate("activate", e, this);
+			} //Post 'activate' events to possible containers
+
+			//Prepare possible droppables
+			if($.ui.ddmanager) $.ui.ddmanager.current = this;
+			if ($.ui.ddmanager && !o.dropBehaviour) $.ui.ddmanager.prepareOffsets(this, e);
+
+			this.dragging = true;
+			return true;
+
+		},
+		mouseStop: function(e) {
+
+			if(this.newPositionAt) this.options.sortIndication.remove.call(this.currentItem, this.newPositionAt); //remove sort indicator
+			this.propagate("stop", e); //Call plugins and trigger callbacks
+
+			//If we are using droppables, inform the manager about the drop
+			var dropped = ($.ui.ddmanager && !this.options.dropBehaviour) ? $.ui.ddmanager.drop(this, e) : false;
+			if(!dropped && this.newPositionAt) this.newPositionAt[this.direction == 'down' ? 'before' : 'after'](this.currentItem); //Append to element to its new position
+
+			if(this.position.dom != this.currentItem.prev()[0]) this.propagate("update", e); //Trigger update callback if the DOM position has changed
+			if(!this.element[0].contains(this.currentItem[0])) { //Node was moved out of the current element
+				this.propagate("remove", e);
+				for (var i = this.containers.length - 1; i >= 0; i--){
+					if(this.containers[i].element[0].contains(this.currentItem[0])) {
+						this.containers[i].propagate("update", e, this);
+						this.containers[i].propagate("receive", e, this);
+					}
+				};
+			};
+
+			//Post events to containers
+			for (var i = this.containers.length - 1; i >= 0; i--){
+				this.containers[i].propagate("deactivate", e, this);
+				if(this.containers[i].containerCache.over) {
+					this.containers[i].propagate("out", e, this);
+					this.containers[i].containerCache.over = 0;
+				}
+			}
+
+			this.dragging = false;
+			if(this.cancelHelperRemoval) return false;
+			this.helper.remove();
+
+			return false;
+
+		},
+		mouseDrag: function(e) {
+
+			//Compute the helpers position
+			this.position.current = { top: e.pageY + 5, left: e.pageX + 5 };
+			this.position.absolute = { left: e.pageX + 5, top: e.pageY + 5 };
+
+			//Interconnect with droppables
+			if($.ui.ddmanager) $.ui.ddmanager.drag(this, e);
+			var intersectsWithDroppable = false;
+			$.each($.ui.ddmanager.droppables, function() {
+				if(this.isover) intersectsWithDroppable = true;
+			});
+
+			//Rearrange
+			if(intersectsWithDroppable) {
+				if(this.newPositionAt) this.options.sortIndication.remove.call(this.currentItem, this.newPositionAt);
+			} else {
+				for (var i = this.items.length - 1; i >= 0; i--) {
+
+					if(this.currentItem[0].contains(this.items[i].item[0])) continue;
+
+					var intersection = this.intersectsWithEdge(this.items[i]);
+					if(!intersection) continue;
+
+					this.direction = intersection == 1 ? "down" : "up";
+					this.rearrange(e, this.items[i]);
+					this.propagate("change", e); //Call plugins and callbacks
+					break;
+				}
+			}
+
+			//Post events to containers
+			this.contactContainers(e);
+
+			this.propagate("sort", e); //Call plugins and callbacks
+			this.helper.css({ left: this.position.current.left+'px', top: this.position.current.top+'px' }); // Stick the helper to the cursor
+			return false;
+
+		},
+		rearrange: function(e, i, a) {
+			if(i) {
+				if(this.newPositionAt) this.options.sortIndication.remove.call(this.currentItem, this.newPositionAt);
+				this.newPositionAt = i.item;
+				this.options.sortIndication[this.direction].call(this.currentItem, this.newPositionAt);
+			} else {
+				//Append
+			}
+		}
+	}));
+
+	$.extend($.ui.sortableTree, {
+		defaults: {
+			items: '> *',
+			zIndex: 1000,
+			distance: 1
+		},
+		getter: "serialize toArray"
+	});
+
+
+
+})(jQuery);
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/readme.md b/htdocs/includes/jquery/plugins/jquerytreeview/readme.md
new file mode 100644
index 00000000000..27257d1384c
--- /dev/null
+++ b/htdocs/includes/jquery/plugins/jquerytreeview/readme.md
@@ -0,0 +1,47 @@
+# jQuery Treeview
+
+Lightweight and flexible transformation of an unordered list into an expandable and collapsable tree, great for unobtrusive navigation enhancements. Supports both location and cookie based persistence.
+
+Provides some options for customizing, an async-tree extension and an experimental sortable extension.
+
+![screenshot](https://raw.github.com/jzaefferer/jquery-treeview/master/screenshot.png)
+
+### Note that this project is not actively maintained anymore.  
+Check out [jqTree](http://mbraak.github.com/jqTree/) for a more up to date plugin.
+
+---
+
+#### [Demo](http://jquery.bassistance.de/treeview/demo/)
+
+#### [Download](https://github.com/jzaefferer/jquery-treeview/zipball/1.4.1)
+
+#### [Changelog](https://raw.github.com/jzaefferer/jquery-treeview/master/changelog.md)
+
+
+## Todo
+
+### 1.5
+- Add classes and rules for root items
+- Lazy-loading: render the complete tree, but only apply hitzones and hiding of children to the first level on load
+- Async treeview
+  - Support animations
+  - Support persist options
+
+
+## Documentation
+
+```javascript
+.treeview( options )
+```
+
+Takes an unordered list and makes all branches collapsable. The "treeview" class is added if not already present. To hide branches on first display, mark their li elements with the class "closed". If the "collapsed" option is used, mark initially open branches with class "open".
+
+
+## License
+
+Copyright (c) 2007 Jörn Zaefferer
+
+Dual licensed under the MIT and GPL licenses:
+
+- http://www.opensource.org/licenses/mit-license.php
+- http://www.gnu.org/licenses/gpl.html
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/screenshot.png b/htdocs/includes/jquery/plugins/jquerytreeview/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..68dd00dff1060e41cee2f4841a6caab00d20bfaf
GIT binary patch
literal 2387
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
FV1gj7s~!LV

literal 0
HcmV?d00001

diff --git a/htdocs/includes/jquery/plugins/jstree/jquery.cookie.js b/htdocs/includes/jquery/plugins/jstree/jquery.cookie.js
deleted file mode 100644
index 3cf7875384e..00000000000
--- a/htdocs/includes/jquery/plugins/jstree/jquery.cookie.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/*!
- * jQuery Cookie Plugin
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2011, Klaus Hartl
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.opensource.org/licenses/GPL-2.0
- */
-(function($) {
-    $.cookie = function(key, value, options) {
-
-        // key and at least value given, set cookie...
-        if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) {
-            options = $.extend({}, options);
-
-            if (value === null || value === undefined) {
-                options.expires = -1;
-            }
-
-            if (typeof options.expires === 'number') {
-                var days = options.expires, t = options.expires = new Date();
-                t.setDate(t.getDate() + days);
-            }
-
-            value = String(value);
-
-            return (document.cookie = [
-                encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value),
-                options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
-                options.path    ? '; path=' + options.path : '',
-                options.domain  ? '; domain=' + options.domain : '',
-                options.secure  ? '; secure' : ''
-            ].join(''));
-        }
-
-        // key and possibly options given, get cookie...
-        options = value || {};
-        var decode = options.raw ? function(s) { return s; } : decodeURIComponent;
-
-        var pairs = document.cookie.split('; ');
-        for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) {
-            if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined
-        }
-        return null;
-    };
-    $.removeCookie = function(cookieName) {
-    	$.cookie(cookieName, null);
-    }
-})(jQuery);
diff --git a/htdocs/includes/jquery/plugins/jstree/jquery.hotkeys.js b/htdocs/includes/jquery/plugins/jstree/jquery.hotkeys.js
deleted file mode 100644
index fbd71c71ec7..00000000000
--- a/htdocs/includes/jquery/plugins/jstree/jquery.hotkeys.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * jQuery Hotkeys Plugin
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- *
- * Based upon the plugin by Tzury Bar Yochay:
- * http://github.com/tzuryby/hotkeys
- *
- * Original idea by:
- * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/
-*/
-
-(function(jQuery){
-	
-	jQuery.hotkeys = {
-		version: "0.8",
-
-		specialKeys: {
-			8: "backspace", 9: "tab", 13: "return", 16: "shift", 17: "ctrl", 18: "alt", 19: "pause",
-			20: "capslock", 27: "esc", 32: "space", 33: "pageup", 34: "pagedown", 35: "end", 36: "home",
-			37: "left", 38: "up", 39: "right", 40: "down", 45: "insert", 46: "del", 
-			96: "0", 97: "1", 98: "2", 99: "3", 100: "4", 101: "5", 102: "6", 103: "7",
-			104: "8", 105: "9", 106: "*", 107: "+", 109: "-", 110: ".", 111 : "/", 
-			112: "f1", 113: "f2", 114: "f3", 115: "f4", 116: "f5", 117: "f6", 118: "f7", 119: "f8", 
-			120: "f9", 121: "f10", 122: "f11", 123: "f12", 144: "numlock", 145: "scroll", 191: "/", 224: "meta"
-		},
-	
-		shiftNums: {
-			"`": "~", "1": "!", "2": "@", "3": "#", "4": "$", "5": "%", "6": "^", "7": "&", 
-			"8": "*", "9": "(", "0": ")", "-": "_", "=": "+", ";": ": ", "'": "\"", ",": "<", 
-			".": ">",  "/": "?",  "\\": "|"
-		}
-	};
-
-	function keyHandler( handleObj ) {
-		// Only care when a possible input has been specified
-		if ( typeof handleObj.data !== "string" ) {
-			return;
-		}
-		
-		var origHandler = handleObj.handler,
-			keys = handleObj.data.toLowerCase().split(" ");
-	
-		handleObj.handler = function( event ) {
-			// Don't fire in text-accepting inputs that we didn't directly bind to
-			if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) ||
-				 event.target.type === "text") ) {
-				return;
-			}
-			
-			// Keypress represents characters, not special keys
-			var special = event.type !== "keypress" && jQuery.hotkeys.specialKeys[ event.which ],
-				character = String.fromCharCode( event.which ).toLowerCase(),
-				key, modif = "", possible = {};
-
-			// check combinations (alt|ctrl|shift+anything)
-			if ( event.altKey && special !== "alt" ) {
-				modif += "alt+";
-			}
-
-			if ( event.ctrlKey && special !== "ctrl" ) {
-				modif += "ctrl+";
-			}
-			
-			// TODO: Need to make sure this works consistently across platforms
-			if ( event.metaKey && !event.ctrlKey && special !== "meta" ) {
-				modif += "meta+";
-			}
-
-			if ( event.shiftKey && special !== "shift" ) {
-				modif += "shift+";
-			}
-
-			if ( special ) {
-				possible[ modif + special ] = true;
-
-			} else {
-				possible[ modif + character ] = true;
-				possible[ modif + jQuery.hotkeys.shiftNums[ character ] ] = true;
-
-				// "$" can be triggered as "Shift+4" or "Shift+$" or just "$"
-				if ( modif === "shift+" ) {
-					possible[ jQuery.hotkeys.shiftNums[ character ] ] = true;
-				}
-			}
-
-			for ( var i = 0, l = keys.length; i < l; i++ ) {
-				if ( possible[ keys[i] ] ) {
-					return origHandler.apply( this, arguments );
-				}
-			}
-		};
-	}
-
-	jQuery.each([ "keydown", "keyup", "keypress" ], function() {
-		jQuery.event.special[ this ] = { add: keyHandler };
-	});
-
-})( jQuery );
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/jstree/jquery.jstree.min.js b/htdocs/includes/jquery/plugins/jstree/jquery.jstree.min.js
deleted file mode 100644
index 321ce99e990..00000000000
--- a/htdocs/includes/jquery/plugins/jstree/jquery.jstree.min.js
+++ /dev/null
@@ -1,596 +0,0 @@
-"use strict";(function(){if(jQuery&&jQuery.jstree){return;}
-var is_ie6=false,is_ie7=false,is_ff2=false;(function($){$.vakata={};$.vakata.css={get_css:function(rule_name,delete_flag,sheet){rule_name=rule_name.toLowerCase();var css_rules=sheet.cssRules||sheet.rules,j=0;do{if(css_rules.length&&j>css_rules.length+5){return false;}
-if(css_rules[j].selectorText&&css_rules[j].selectorText.toLowerCase()==rule_name){if(delete_flag===true){if(sheet.removeRule){sheet.removeRule(j);}
-if(sheet.deleteRule){sheet.deleteRule(j);}
-return true;}
-else{return css_rules[j];}}}
-while(css_rules[++j]);return false;},add_css:function(rule_name,sheet){if($.jstree.css.get_css(rule_name,false,sheet)){return false;}
-if(sheet.insertRule){sheet.insertRule(rule_name+' { }',0);}else{sheet.addRule(rule_name,null,0);}
-return $.vakata.css.get_css(rule_name);},remove_css:function(rule_name,sheet){return $.vakata.css.get_css(rule_name,true,sheet);},add_sheet:function(opts){var tmp=false,is_new=true;if(opts.str){if(opts.title){tmp=$("style[id='"+opts.title+"-stylesheet']")[0];}
-if(tmp){is_new=false;}
-else{tmp=document.createElement("style");tmp.setAttribute('type',"text/css");if(opts.title){tmp.setAttribute("id",opts.title+"-stylesheet");}}
-if(tmp.styleSheet){if(is_new){document.getElementsByTagName("head")[0].appendChild(tmp);tmp.styleSheet.cssText=opts.str;}
-else{tmp.styleSheet.cssText=tmp.styleSheet.cssText+" "+opts.str;}}
-else{tmp.appendChild(document.createTextNode(opts.str));document.getElementsByTagName("head")[0].appendChild(tmp);}
-return tmp.sheet||tmp.styleSheet;}
-if(opts.url){if(document.createStyleSheet){try{tmp=document.createStyleSheet(opts.url);}catch(e){}}
-else{tmp=document.createElement('link');tmp.rel='stylesheet';tmp.type='text/css';tmp.media="all";tmp.href=opts.url;document.getElementsByTagName("head")[0].appendChild(tmp);return tmp.styleSheet;}}}};var instances=[],focused_instance=-1,plugins={},prepared_move={};$.fn.jstree=function(settings){var isMethodCall=(typeof settings=='string'),args=Array.prototype.slice.call(arguments,1),returnValue=this;if(isMethodCall){if(settings.substring(0,1)=='_'){return returnValue;}
-this.each(function(){var instance=instances[$.data(this,"jstree_instance_id")],methodValue=(instance&&$.isFunction(instance[settings]))?instance[settings].apply(instance,args):instance;if(typeof methodValue!=="undefined"&&(settings.indexOf("is_")===0||(methodValue!==true&&methodValue!==false))){returnValue=methodValue;return false;}});}
-else{this.each(function(){var instance_id=$.data(this,"jstree_instance_id"),a=[],b=settings?$.extend({},true,settings):{},c=$(this),s=false,t=[];a=a.concat(args);if(c.data("jstree")){a.push(c.data("jstree"));}
-b=a.length?$.extend.apply(null,[true,b].concat(a)):b;if(typeof instance_id!=="undefined"&&instances[instance_id]){instances[instance_id].destroy();}
-instance_id=parseInt(instances.push({}),10)-1;$.data(this,"jstree_instance_id",instance_id);b.plugins=$.isArray(b.plugins)?b.plugins:$.jstree.defaults.plugins.slice();b.plugins.unshift("core");b.plugins=b.plugins.sort().join(",,").replace(/(,|^)([^,]+)(,,\2)+(,|$)/g,"$1$2$4").replace(/,,+/g,",").replace(/,$/,"").split(",");s=$.extend(true,{},$.jstree.defaults,b);s.plugins=b.plugins;$.each(plugins,function(i,val){if($.inArray(i,s.plugins)===-1){s[i]=null;delete s[i];}
-else{t.push(i);}});s.plugins=t;instances[instance_id]=new $.jstree._instance(instance_id,$(this).addClass("jstree jstree-"+instance_id),s);$.each(instances[instance_id]._get_settings().plugins,function(i,val){instances[instance_id].data[val]={};});$.each(instances[instance_id]._get_settings().plugins,function(i,val){if(plugins[val]){plugins[val].__init.apply(instances[instance_id]);}});setTimeout(function(){if(instances[instance_id]){instances[instance_id].init();}},0);});}
-return returnValue;};$.jstree={defaults:{plugins:[]},_focused:function(){return instances[focused_instance]||null;},_reference:function(needle){if(instances[needle]){return instances[needle];}
-var o=$(needle);if(!o.length&&typeof needle==="string"){o=$("#"+needle);}
-if(!o.length){return null;}
-return instances[o.closest(".jstree").data("jstree_instance_id")]||null;},_instance:function(index,container,settings){this.data={core:{}};this.get_settings=function(){return $.extend(true,{},settings);};this._get_settings=function(){return settings;};this.get_index=function(){return index;};this.get_container=function(){return container;};this.get_container_ul=function(){return container.children("ul:eq(0)");};this._set_settings=function(s){settings=$.extend(true,{},settings,s);};},_fn:{},plugin:function(pname,pdata){pdata=$.extend({},{__init:$.noop,__destroy:$.noop,_fn:{},defaults:false},pdata);plugins[pname]=pdata;$.jstree.defaults[pname]=pdata.defaults;$.each(pdata._fn,function(i,val){val.plugin=pname;val.old=$.jstree._fn[i];$.jstree._fn[i]=function(){var rslt,func=val,args=Array.prototype.slice.call(arguments),evnt=new $.Event("before.jstree"),rlbk=false;if(this.data.core.locked===true&&i!=="unlock"&&i!=="is_locked"){return;}
-do{if(func&&func.plugin&&$.inArray(func.plugin,this._get_settings().plugins)!==-1){break;}
-func=func.old;}while(func);if(!func){return;}
-if(i.indexOf("_")===0){rslt=func.apply(this,args);}
-else{rslt=this.get_container().triggerHandler(evnt,{"func":i,"inst":this,"args":args,"plugin":func.plugin});if(rslt===false){return;}
-if(typeof rslt!=="undefined"){args=rslt;}
-rslt=func.apply($.extend({},this,{__callback:function(data){this.get_container().triggerHandler(i+'.jstree',{"inst":this,"args":args,"rslt":data,"rlbk":rlbk});},__rollback:function(){rlbk=this.get_rollback();return rlbk;},__call_old:function(replace_arguments){return func.old.apply(this,(replace_arguments?Array.prototype.slice.call(arguments,1):args));}}),args);}
-return rslt;};$.jstree._fn[i].old=val.old;$.jstree._fn[i].plugin=pname;});},rollback:function(rb){if(rb){if(!$.isArray(rb)){rb=[rb];}
-$.each(rb,function(i,val){instances[val.i].set_rollback(val.h,val.d);});}}};$.jstree._fn=$.jstree._instance.prototype={};$(function(){var u=navigator.userAgent.toLowerCase(),v=(u.match(/.+?(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,'0'])[1],css_string=''+'.jstree ul, .jstree li { display:block; margin:0 0 0 0; padding:0 0 0 0; list-style-type:none; } '+'.jstree li { display:block; min-height:18px; line-height:18px; white-space:nowrap; margin-left:18px; min-width:18px; } '+'.jstree-rtl li { margin-left:0; margin-right:18px; } '+'.jstree > ul > li { margin-left:0px; } '+'.jstree-rtl > ul > li { margin-right:0px; } '+'.jstree ins { display:inline-block; text-decoration:none; width:18px; height:18px; margin:0 0 0 0; padding:0; } '+'.jstree a { display:inline-block; line-height:16px; height:16px; color:black; white-space:nowrap; text-decoration:none; padding:1px 2px; margin:0; } '+'.jstree a:focus { outline: none; } '+'.jstree a > ins { height:16px; width:16px; } '+'.jstree a > .jstree-icon { margin-right:3px; } '+'.jstree-rtl a > .jstree-icon { margin-left:3px; margin-right:0; } '+'li.jstree-open > ul { display:block; } '+'li.jstree-closed > ul { display:none; } ';if(/msie/.test(u)&&parseInt(v,10)==6){is_ie6=true;try{document.execCommand("BackgroundImageCache",false,true);}catch(err){}
-css_string+=''+'.jstree li { height:18px; margin-left:0; margin-right:0; } '+'.jstree li li { margin-left:18px; } '+'.jstree-rtl li li { margin-left:0px; margin-right:18px; } '+'li.jstree-open ul { display:block; } '+'li.jstree-closed ul { display:none !important; } '+'.jstree li a { display:inline; border-width:0 !important; padding:0px 2px !important; } '+'.jstree li a ins { height:16px; width:16px; margin-right:3px; } '+'.jstree-rtl li a ins { margin-right:0px; margin-left:3px; } ';}
-if(/msie/.test(u)&&parseInt(v,10)==7){is_ie7=true;css_string+='.jstree li a { border-width:0 !important; padding:0px 2px !important; } ';}
-if(!/compatible/.test(u)&&/mozilla/.test(u)&&parseFloat(v,10)<1.9){is_ff2=true;css_string+=''+'.jstree ins { display:-moz-inline-box; } '+'.jstree li { line-height:12px; } '+'.jstree a { display:-moz-inline-box; } '+'.jstree .jstree-no-icons .jstree-checkbox { display:-moz-inline-stack !important; } ';}
-$.vakata.css.add_sheet({str:css_string,title:"jstree"});});$.jstree.plugin("core",{__init:function(){this.data.core.locked=false;this.data.core.to_open=this.get_settings().core.initially_open;this.data.core.to_load=this.get_settings().core.initially_load;},defaults:{html_titles:false,animation:500,initially_open:[],initially_load:[],open_parents:true,notify_plugins:true,rtl:false,load_open:false,strings:{loading:"Loading ...",new_node:"New node",multiple_selection:"Multiple selection"}},_fn:{init:function(){this.set_focus();if(this._get_settings().core.rtl){this.get_container().addClass("jstree-rtl").css("direction","rtl");}
-this.get_container().html("<ul><li class='jstree-last jstree-leaf'><ins>&#160;</ins><a class='jstree-loading' href='#'><ins class='jstree-icon'>&#160;</ins>"+this._get_string("loading")+"</a></li></ul>");this.data.core.li_height=this.get_container_ul().find("li.jstree-closed, li.jstree-leaf").eq(0).height()||18;this.get_container().delegate("li > ins","click.jstree",$.proxy(function(event){var trgt=$(event.target);this.toggle_node(trgt);},this)).bind("mousedown.jstree",$.proxy(function(){this.set_focus();},this)).bind("dblclick.jstree",function(event){var sel;if(document.selection&&document.selection.empty){document.selection.empty();}
-else{if(window.getSelection){sel=window.getSelection();try{sel.removeAllRanges();sel.collapse();}catch(err){}}}});if(this._get_settings().core.notify_plugins){this.get_container().bind("load_node.jstree",$.proxy(function(e,data){var o=this._get_node(data.rslt.obj),t=this;if(o===-1){o=this.get_container_ul();}
-if(!o.length){return;}
-o.find("li").each(function(){var th=$(this);if(th.data("jstree")){$.each(th.data("jstree"),function(plugin,values){if(t.data[plugin]&&$.isFunction(t["_"+plugin+"_notify"])){t["_"+plugin+"_notify"].call(t,th,values);}});}});},this));}
-if(this._get_settings().core.load_open){this.get_container().bind("load_node.jstree",$.proxy(function(e,data){var o=this._get_node(data.rslt.obj),t=this;if(o===-1){o=this.get_container_ul();}
-if(!o.length){return;}
-o.find("li.jstree-open:not(:has(ul))").each(function(){t.load_node(this,$.noop,$.noop);});},this));}
-this.__callback();this.load_node(-1,function(){this.loaded();this.reload_nodes();});},destroy:function(){var i,n=this.get_index(),s=this._get_settings(),_this=this;$.each(s.plugins,function(i,val){try{plugins[val].__destroy.apply(_this);}catch(err){}});this.__callback();if(this.is_focused()){for(i in instances){if(instances.hasOwnProperty(i)&&i!=n){instances[i].set_focus();break;}}}
-if(n===focused_instance){focused_instance=-1;}
-this.get_container().unbind(".jstree").undelegate(".jstree").removeData("jstree_instance_id").find("[class^='jstree']").andSelf().attr("class",function(){return this.className.replace(/jstree[^ ]*|$/ig,'');});$(document).unbind(".jstree-"+n).undelegate(".jstree-"+n);instances[n]=null;delete instances[n];},_core_notify:function(n,data){if(data.opened){this.open_node(n,false,true);}},lock:function(){this.data.core.locked=true;this.get_container().children("ul").addClass("jstree-locked").css("opacity","0.7");this.__callback({});},unlock:function(){this.data.core.locked=false;this.get_container().children("ul").removeClass("jstree-locked").css("opacity","1");this.__callback({});},is_locked:function(){return this.data.core.locked;},save_opened:function(){var _this=this;this.data.core.to_open=[];this.get_container_ul().find("li.jstree-open").each(function(){if(this.id){_this.data.core.to_open.push("#"+this.id.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:"));}});this.__callback(_this.data.core.to_open);},save_loaded:function(){},reload_nodes:function(is_callback){var _this=this,done=true,current=[],remaining=[];if(!is_callback){this.data.core.reopen=false;this.data.core.refreshing=true;this.data.core.to_open=$.map($.makeArray(this.data.core.to_open),function(n){return"#"+n.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:");});this.data.core.to_load=$.map($.makeArray(this.data.core.to_load),function(n){return"#"+n.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:");});if(this.data.core.to_open.length){this.data.core.to_load=this.data.core.to_load.concat(this.data.core.to_open);}}
-if(this.data.core.to_load.length){$.each(this.data.core.to_load,function(i,val){if(val=="#"){return true;}
-if($(val).length){current.push(val);}
-else{remaining.push(val);}});if(current.length){this.data.core.to_load=remaining;$.each(current,function(i,val){if(!_this._is_loaded(val)){_this.load_node(val,function(){_this.reload_nodes(true);},function(){_this.reload_nodes(true);});done=false;}});}}
-if(this.data.core.to_open.length){$.each(this.data.core.to_open,function(i,val){_this.open_node(val,false,true);});}
-if(done){if(this.data.core.reopen){clearTimeout(this.data.core.reopen);}
-this.data.core.reopen=setTimeout(function(){_this.__callback({},_this);},50);this.data.core.refreshing=false;this.reopen();}},reopen:function(){var _this=this;if(this.data.core.to_open.length){$.each(this.data.core.to_open,function(i,val){_this.open_node(val,false,true);});}
-this.__callback({});},refresh:function(obj){var _this=this;this.save_opened();if(!obj){obj=-1;}
-obj=this._get_node(obj);if(!obj){obj=-1;}
-if(obj!==-1){obj.children("UL").remove();}
-else{this.get_container_ul().empty();}
-this.load_node(obj,function(){_this.__callback({"obj":obj});_this.reload_nodes();});},loaded:function(){this.__callback();},set_focus:function(){if(this.is_focused()){return;}
-var f=$.jstree._focused();if(f){f.unset_focus();}
-this.get_container().addClass("jstree-focused");focused_instance=this.get_index();this.__callback();},is_focused:function(){return focused_instance==this.get_index();},unset_focus:function(){if(this.is_focused()){this.get_container().removeClass("jstree-focused");focused_instance=-1;}
-this.__callback();},_get_node:function(obj){var $obj=$(obj,this.get_container());if($obj.is(".jstree")||obj==-1){return-1;}
-$obj=$obj.closest("li",this.get_container());return $obj.length?$obj:false;},_get_next:function(obj,strict){obj=this._get_node(obj);if(obj===-1){return this.get_container().find("> ul > li:first-child");}
-if(!obj.length){return false;}
-if(strict){return(obj.nextAll("li").size()>0)?obj.nextAll("li:eq(0)"):false;}
-if(obj.hasClass("jstree-open")){return obj.find("li:eq(0)");}
-else if(obj.nextAll("li").size()>0){return obj.nextAll("li:eq(0)");}
-else{return obj.parentsUntil(".jstree","li").next("li").eq(0);}},_get_prev:function(obj,strict){obj=this._get_node(obj);if(obj===-1){return this.get_container().find("> ul > li:last-child");}
-if(!obj.length){return false;}
-if(strict){return(obj.prevAll("li").length>0)?obj.prevAll("li:eq(0)"):false;}
-if(obj.prev("li").length){obj=obj.prev("li").eq(0);while(obj.hasClass("jstree-open")){obj=obj.children("ul:eq(0)").children("li:last");}
-return obj;}
-else{var o=obj.parentsUntil(".jstree","li:eq(0)");return o.length?o:false;}},_get_parent:function(obj){obj=this._get_node(obj);if(obj==-1||!obj.length){return false;}
-var o=obj.parentsUntil(".jstree","li:eq(0)");return o.length?o:-1;},_get_children:function(obj){obj=this._get_node(obj);if(obj===-1){return this.get_container().children("ul:eq(0)").children("li");}
-if(!obj.length){return false;}
-return obj.children("ul:eq(0)").children("li");},get_path:function(obj,id_mode){var p=[],_this=this;obj=this._get_node(obj);if(obj===-1||!obj||!obj.length){return false;}
-obj.parentsUntil(".jstree","li").each(function(){p.push(id_mode?this.id:_this.get_text(this));});p.reverse();p.push(id_mode?obj.attr("id"):this.get_text(obj));return p;},_get_string:function(key){return this._get_settings().core.strings[key]||key;},is_open:function(obj){obj=this._get_node(obj);return obj&&obj!==-1&&obj.hasClass("jstree-open");},is_closed:function(obj){obj=this._get_node(obj);return obj&&obj!==-1&&obj.hasClass("jstree-closed");},is_leaf:function(obj){obj=this._get_node(obj);return obj&&obj!==-1&&obj.hasClass("jstree-leaf");},correct_state:function(obj){obj=this._get_node(obj);if(!obj||obj===-1){return false;}
-obj.removeClass("jstree-closed jstree-open").addClass("jstree-leaf").children("ul").remove();this.__callback({"obj":obj});},open_node:function(obj,callback,skip_animation){obj=this._get_node(obj);if(!obj.length){return false;}
-if(!obj.hasClass("jstree-closed")){if(callback){callback.call();}return false;}
-var s=skip_animation||is_ie6?0:this._get_settings().core.animation,t=this;if(!this._is_loaded(obj)){obj.children("a").addClass("jstree-loading");this.load_node(obj,function(){t.open_node(obj,callback,skip_animation);},callback);}
-else{if(this._get_settings().core.open_parents){obj.parentsUntil(".jstree",".jstree-closed").each(function(){t.open_node(this,false,true);});}
-if(s){obj.children("ul").css("display","none");}
-obj.removeClass("jstree-closed").addClass("jstree-open").children("a").removeClass("jstree-loading");if(s){obj.children("ul").stop(true,true).slideDown(s,function(){this.style.display="";t.after_open(obj);});}
-else{t.after_open(obj);}
-this.__callback({"obj":obj});if(callback){callback.call();}}},after_open:function(obj){this.__callback({"obj":obj});},close_node:function(obj,skip_animation){obj=this._get_node(obj);var s=skip_animation||is_ie6?0:this._get_settings().core.animation,t=this;if(!obj.length||!obj.hasClass("jstree-open")){return false;}
-if(s){obj.children("ul").attr("style","display:block !important");}
-obj.removeClass("jstree-open").addClass("jstree-closed");if(s){obj.children("ul").stop(true,true).slideUp(s,function(){this.style.display="";t.after_close(obj);});}
-else{t.after_close(obj);}
-this.__callback({"obj":obj});},after_close:function(obj){this.__callback({"obj":obj});},toggle_node:function(obj){obj=this._get_node(obj);if(obj.hasClass("jstree-closed")){return this.open_node(obj);}
-if(obj.hasClass("jstree-open")){return this.close_node(obj);}},open_all:function(obj,do_animation,original_obj){obj=obj?this._get_node(obj):-1;if(!obj||obj===-1){obj=this.get_container_ul();}
-if(original_obj){obj=obj.find("li.jstree-closed");}
-else{original_obj=obj;if(obj.is(".jstree-closed")){obj=obj.find("li.jstree-closed").andSelf();}
-else{obj=obj.find("li.jstree-closed");}}
-var _this=this;obj.each(function(){var __this=this;if(!_this._is_loaded(this)){_this.open_node(this,function(){_this.open_all(__this,do_animation,original_obj);},!do_animation);}
-else{_this.open_node(this,false,!do_animation);}});if(original_obj.find('li.jstree-closed').length===0){this.__callback({"obj":original_obj});}},close_all:function(obj,do_animation){var _this=this;obj=obj?this._get_node(obj):this.get_container();if(!obj||obj===-1){obj=this.get_container_ul();}
-obj.find("li.jstree-open").andSelf().each(function(){_this.close_node(this,!do_animation);});this.__callback({"obj":obj});},clean_node:function(obj){obj=obj&&obj!=-1?$(obj):this.get_container_ul();obj=obj.is("li")?obj.find("li").andSelf():obj.find("li");obj.removeClass("jstree-last").filter("li:last-child").addClass("jstree-last").end().filter(":has(li)").not(".jstree-open").removeClass("jstree-leaf").addClass("jstree-closed");obj.not(".jstree-open, .jstree-closed").addClass("jstree-leaf").children("ul").remove();this.__callback({"obj":obj});},get_rollback:function(){this.__callback();return{i:this.get_index(),h:this.get_container().children("ul").clone(true),d:this.data};},set_rollback:function(html,data){this.get_container().empty().append(html);this.data=data;this.__callback();},load_node:function(obj,s_call,e_call){this.__callback({"obj":obj});},_is_loaded:function(obj){return true;},create_node:function(obj,position,js,callback,is_loaded){obj=this._get_node(obj);position=typeof position==="undefined"?"last":position;var d=$("<li />"),s=this._get_settings().core,tmp;if(obj!==-1&&!obj.length){return false;}
-if(!is_loaded&&!this._is_loaded(obj)){this.load_node(obj,function(){this.create_node(obj,position,js,callback,true);});return false;}
-this.__rollback();if(typeof js==="string"){js={"data":js};}
-if(!js){js={};}
-if(js.attr){d.attr(js.attr);}
-if(js.metadata){d.data(js.metadata);}
-if(js.state){d.addClass("jstree-"+js.state);}
-if(!js.data){js.data=this._get_string("new_node");}
-if(!$.isArray(js.data)){tmp=js.data;js.data=[];js.data.push(tmp);}
-$.each(js.data,function(i,m){tmp=$("<a />");if($.isFunction(m)){m=m.call(this,js);}
-if(typeof m=="string"){tmp.attr('href','#')[s.html_titles?"html":"text"](m);}
-else{if(!m.attr){m.attr={};}
-if(!m.attr.href){m.attr.href='#';}
-tmp.attr(m.attr)[s.html_titles?"html":"text"](m.title);if(m.language){tmp.addClass(m.language);}}
-tmp.prepend("<ins class='jstree-icon'>&#160;</ins>");if(!m.icon&&js.icon){m.icon=js.icon;}
-if(m.icon){if(m.icon.indexOf("/")===-1){tmp.children("ins").addClass(m.icon);}
-else{tmp.children("ins").css("background","url('"+m.icon+"') center center no-repeat");}}
-d.append(tmp);});d.prepend("<ins class='jstree-icon'>&#160;</ins>");if(obj===-1){obj=this.get_container();if(position==="before"){position="first";}
-if(position==="after"){position="last";}}
-switch(position){case"before":obj.before(d);tmp=this._get_parent(obj);break;case"after":obj.after(d);tmp=this._get_parent(obj);break;case"inside":case"first":if(!obj.children("ul").length){obj.append("<ul />");}
-obj.children("ul").prepend(d);tmp=obj;break;case"last":if(!obj.children("ul").length){obj.append("<ul />");}
-obj.children("ul").append(d);tmp=obj;break;default:if(!obj.children("ul").length){obj.append("<ul />");}
-if(!position){position=0;}
-tmp=obj.children("ul").children("li").eq(position);if(tmp.length){tmp.before(d);}
-else{obj.children("ul").append(d);}
-tmp=obj;break;}
-if(tmp===-1||tmp.get(0)===this.get_container().get(0)){tmp=-1;}
-this.clean_node(tmp);this.__callback({"obj":d,"parent":tmp});if(callback){callback.call(this,d);}
-return d;},get_text:function(obj){obj=this._get_node(obj);if(!obj.length){return false;}
-var s=this._get_settings().core.html_titles;obj=obj.children("a:eq(0)");if(s){obj=obj.clone();obj.children("INS").remove();return obj.html();}
-else{obj=obj.contents().filter(function(){return this.nodeType==3;})[0];return obj.nodeValue;}},set_text:function(obj,val){obj=this._get_node(obj);if(!obj.length){return false;}
-obj=obj.children("a:eq(0)");if(this._get_settings().core.html_titles){var tmp=obj.children("INS").clone();obj.html(val).prepend(tmp);this.__callback({"obj":obj,"name":val});return true;}
-else{obj=obj.contents().filter(function(){return this.nodeType==3;})[0];this.__callback({"obj":obj,"name":val});return(obj.nodeValue=val);}},rename_node:function(obj,val){obj=this._get_node(obj);this.__rollback();if(obj&&obj.length&&this.set_text.apply(this,Array.prototype.slice.call(arguments))){this.__callback({"obj":obj,"name":val});}},delete_node:function(obj){obj=this._get_node(obj);if(!obj.length){return false;}
-this.__rollback();var p=this._get_parent(obj),prev=$([]),t=this;obj.each(function(){prev=prev.add(t._get_prev(this));});obj=obj.detach();if(p!==-1&&p.find("> ul > li").length===0){p.removeClass("jstree-open jstree-closed").addClass("jstree-leaf");}
-this.clean_node(p);this.__callback({"obj":obj,"prev":prev,"parent":p});return obj;},prepare_move:function(o,r,pos,cb,is_cb){var p={};p.ot=$.jstree._reference(o)||this;p.o=p.ot._get_node(o);p.r=r===-1?-1:this._get_node(r);p.p=(typeof pos==="undefined"||pos===false)?"last":pos;if(!is_cb&&prepared_move.o&&prepared_move.o[0]===p.o[0]&&prepared_move.r[0]===p.r[0]&&prepared_move.p===p.p){this.__callback(prepared_move);if(cb){cb.call(this,prepared_move);}
-return;}
-p.ot=$.jstree._reference(p.o)||this;p.rt=$.jstree._reference(p.r)||this;if(p.r===-1||!p.r){p.cr=-1;switch(p.p){case"first":case"before":case"inside":p.cp=0;break;case"after":case"last":p.cp=p.rt.get_container().find(" > ul > li").length;break;default:p.cp=p.p;break;}}
-else{if(!/^(before|after)$/.test(p.p)&&!this._is_loaded(p.r)){return this.load_node(p.r,function(){this.prepare_move(o,r,pos,cb,true);});}
-switch(p.p){case"before":p.cp=p.r.index();p.cr=p.rt._get_parent(p.r);break;case"after":p.cp=p.r.index()+1;p.cr=p.rt._get_parent(p.r);break;case"inside":case"first":p.cp=0;p.cr=p.r;break;case"last":p.cp=p.r.find(" > ul > li").length;p.cr=p.r;break;default:p.cp=p.p;p.cr=p.r;break;}}
-p.np=p.cr==-1?p.rt.get_container():p.cr;p.op=p.ot._get_parent(p.o);p.cop=p.o.index();if(p.op===-1){p.op=p.ot?p.ot.get_container():this.get_container();}
-if(!/^(before|after)$/.test(p.p)&&p.op&&p.np&&p.op[0]===p.np[0]&&p.o.index()<p.cp){p.cp++;}
-p.or=p.np.find(" > ul > li:nth-child("+(p.cp+1)+")");prepared_move=p;this.__callback(prepared_move);if(cb){cb.call(this,prepared_move);}},check_move:function(){var obj=prepared_move,ret=true,r=obj.r===-1?this.get_container():obj.r;if(!obj||!obj.o||obj.or[0]===obj.o[0]){return false;}
-if(obj.op&&obj.np&&obj.op[0]===obj.np[0]&&obj.cp-1===obj.o.index()){return false;}
-obj.o.each(function(){if(r.parentsUntil(".jstree","li").andSelf().index(this)!==-1){ret=false;return false;}});return ret;},move_node:function(obj,ref,position,is_copy,is_prepared,skip_check){if(!is_prepared){return this.prepare_move(obj,ref,position,function(p){this.move_node(p,false,false,is_copy,true,skip_check);});}
-if(is_copy){prepared_move.cy=true;}
-if(!skip_check&&!this.check_move()){return false;}
-this.__rollback();var o=false;if(is_copy){o=obj.o.clone(true);o.find("*[id]").andSelf().each(function(){if(this.id){this.id="copy_"+this.id;}});}
-else{o=obj.o;}
-if(obj.or.length){obj.or.before(o);}
-else{if(!obj.np.children("ul").length){$("<ul />").appendTo(obj.np);}
-obj.np.children("ul:eq(0)").append(o);}
-try{obj.ot.clean_node(obj.op);obj.rt.clean_node(obj.np);if(!obj.op.find("> ul > li").length){obj.op.removeClass("jstree-open jstree-closed").addClass("jstree-leaf").children("ul").remove();}}catch(e){}
-if(is_copy){prepared_move.cy=true;prepared_move.oc=o;}
-this.__callback(prepared_move);return prepared_move;},_get_move:function(){return prepared_move;}}});})(jQuery);(function($){var scrollbar_width,e1,e2;$(function(){if(/msie/.test(navigator.userAgent.toLowerCase())){e1=$('<textarea cols="10" rows="2"></textarea>').css({position:'absolute',top:-1000,left:0}).appendTo('body');e2=$('<textarea cols="10" rows="2" style="overflow: hidden;"></textarea>').css({position:'absolute',top:-1000,left:0}).appendTo('body');scrollbar_width=e1.width()-e2.width();e1.add(e2).remove();}
-else{e1=$('<div />').css({width:100,height:100,overflow:'auto',position:'absolute',top:-1000,left:0}).prependTo('body').append('<div />').find('div').css({width:'100%',height:200});scrollbar_width=100-e1.width();e1.parent().remove();}});$.jstree.plugin("ui",{__init:function(){this.data.ui.selected=$();this.data.ui.last_selected=false;this.data.ui.hovered=null;this.data.ui.to_select=this.get_settings().ui.initially_select;this.get_container().delegate("a","click.jstree",$.proxy(function(event){event.preventDefault();event.currentTarget.blur();if(!$(event.currentTarget).hasClass("jstree-loading")){this.select_node(event.currentTarget,true,event);}},this)).delegate("a","mouseenter.jstree",$.proxy(function(event){if(!$(event.currentTarget).hasClass("jstree-loading")){this.hover_node(event.target);}},this)).delegate("a","mouseleave.jstree",$.proxy(function(event){if(!$(event.currentTarget).hasClass("jstree-loading")){this.dehover_node(event.target);}},this)).bind("reopen.jstree",$.proxy(function(){this.reselect();},this)).bind("get_rollback.jstree",$.proxy(function(){this.dehover_node();this.save_selected();},this)).bind("set_rollback.jstree",$.proxy(function(){this.reselect();},this)).bind("close_node.jstree",$.proxy(function(event,data){var s=this._get_settings().ui,obj=this._get_node(data.rslt.obj),clk=(obj&&obj.length)?obj.children("ul").find("a.jstree-clicked"):$(),_this=this;if(s.selected_parent_close===false||!clk.length){return;}
-clk.each(function(){_this.deselect_node(this);if(s.selected_parent_close==="select_parent"){_this.select_node(obj);}});},this)).bind("delete_node.jstree",$.proxy(function(event,data){var s=this._get_settings().ui.select_prev_on_delete,obj=this._get_node(data.rslt.obj),clk=(obj&&obj.length)?obj.find("a.jstree-clicked"):[],_this=this;clk.each(function(){_this.deselect_node(this);});if(s&&clk.length){data.rslt.prev.each(function(){if(this.parentNode){_this.select_node(this);return false;}});}},this)).bind("move_node.jstree",$.proxy(function(event,data){if(data.rslt.cy){data.rslt.oc.find("a.jstree-clicked").removeClass("jstree-clicked");}},this));},defaults:{select_limit:-1,select_multiple_modifier:"ctrl",select_range_modifier:"shift",selected_parent_close:"select_parent",selected_parent_open:true,select_prev_on_delete:true,disable_selecting_children:false,initially_select:[]},_fn:{_get_node:function(obj,allow_multiple){if(typeof obj==="undefined"||obj===null){return allow_multiple?this.data.ui.selected:this.data.ui.last_selected;}
-var $obj=$(obj,this.get_container());if($obj.is(".jstree")||obj==-1){return-1;}
-$obj=$obj.closest("li",this.get_container());return $obj.length?$obj:false;},_ui_notify:function(n,data){if(data.selected){this.select_node(n,false);}},save_selected:function(){var _this=this;this.data.ui.to_select=[];this.data.ui.selected.each(function(){if(this.id){_this.data.ui.to_select.push("#"+this.id.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:"));}});this.__callback(this.data.ui.to_select);},reselect:function(){var _this=this,s=this.data.ui.to_select;s=$.map($.makeArray(s),function(n){return"#"+n.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:");});$.each(s,function(i,val){if(val&&val!=="#"){_this.select_node(val);}});this.data.ui.selected=this.data.ui.selected.filter(function(){return this.parentNode;});this.__callback();},refresh:function(obj){this.save_selected();return this.__call_old();},hover_node:function(obj){obj=this._get_node(obj);if(!obj.length){return false;}
-if(!obj.hasClass("jstree-hovered")){this.dehover_node();}
-this.data.ui.hovered=obj.children("a").addClass("jstree-hovered").parent();this._fix_scroll(obj);this.__callback({"obj":obj});},dehover_node:function(){var obj=this.data.ui.hovered,p;if(!obj||!obj.length){return false;}
-p=obj.children("a").removeClass("jstree-hovered").parent();if(this.data.ui.hovered[0]===p[0]){this.data.ui.hovered=null;}
-this.__callback({"obj":obj});},select_node:function(obj,check,e){obj=this._get_node(obj);if(obj==-1||!obj||!obj.length){return false;}
-var s=this._get_settings().ui,is_multiple=(s.select_multiple_modifier=="on"||(s.select_multiple_modifier!==false&&e&&e[s.select_multiple_modifier+"Key"])),is_range=(s.select_range_modifier!==false&&e&&e[s.select_range_modifier+"Key"]&&this.data.ui.last_selected&&this.data.ui.last_selected[0]!==obj[0]&&this.data.ui.last_selected.parent()[0]===obj.parent()[0]),is_selected=this.is_selected(obj),proceed=true,t=this;if(check){if(s.disable_selecting_children&&is_multiple&&((obj.parentsUntil(".jstree","li").children("a.jstree-clicked").length)||(obj.children("ul").find("a.jstree-clicked:eq(0)").length))){return false;}
-proceed=false;switch(!0){case(is_range):this.data.ui.last_selected.addClass("jstree-last-selected");obj=obj[obj.index()<this.data.ui.last_selected.index()?"nextUntil":"prevUntil"](".jstree-last-selected").andSelf();if(s.select_limit==-1||obj.length<s.select_limit){this.data.ui.last_selected.removeClass("jstree-last-selected");this.data.ui.selected.each(function(){if(this!==t.data.ui.last_selected[0]){t.deselect_node(this);}});is_selected=false;proceed=true;}
-else{proceed=false;}
-break;case(is_selected&&!is_multiple):this.deselect_all();is_selected=false;proceed=true;break;case(!is_selected&&!is_multiple):if(s.select_limit==-1||s.select_limit>0){this.deselect_all();proceed=true;}
-break;case(is_selected&&is_multiple):this.deselect_node(obj);break;case(!is_selected&&is_multiple):if(s.select_limit==-1||this.data.ui.selected.length+1<=s.select_limit){proceed=true;}
-break;}}
-if(proceed&&!is_selected){if(!is_range){this.data.ui.last_selected=obj;}
-obj.children("a").addClass("jstree-clicked");if(s.selected_parent_open){obj.parents(".jstree-closed").each(function(){t.open_node(this,false,true);});}
-this.data.ui.selected=this.data.ui.selected.add(obj);this._fix_scroll(obj.eq(0));this.__callback({"obj":obj,"e":e});}},_fix_scroll:function(obj){var c=this.get_container()[0],t;if(c.scrollHeight>c.offsetHeight){obj=this._get_node(obj);if(!obj||obj===-1||!obj.length||!obj.is(":visible")){return;}
-t=obj.offset().top-this.get_container().offset().top;if(t<0){c.scrollTop=c.scrollTop+t-1;}
-if(t+this.data.core.li_height+(c.scrollWidth>c.offsetWidth?scrollbar_width:0)>c.offsetHeight){c.scrollTop=c.scrollTop+(t-c.offsetHeight+this.data.core.li_height+1+(c.scrollWidth>c.offsetWidth?scrollbar_width:0));}}},deselect_node:function(obj){obj=this._get_node(obj);if(!obj.length){return false;}
-if(this.is_selected(obj)){obj.children("a").removeClass("jstree-clicked");this.data.ui.selected=this.data.ui.selected.not(obj);if(this.data.ui.last_selected.get(0)===obj.get(0)){this.data.ui.last_selected=this.data.ui.selected.eq(0);}
-this.__callback({"obj":obj});}},toggle_select:function(obj){obj=this._get_node(obj);if(!obj.length){return false;}
-if(this.is_selected(obj)){this.deselect_node(obj);}
-else{this.select_node(obj);}},is_selected:function(obj){return this.data.ui.selected.index(this._get_node(obj))>=0;},get_selected:function(context){return context?$(context).find("a.jstree-clicked").parent():this.data.ui.selected;},deselect_all:function(context){var ret=context?$(context).find("a.jstree-clicked").parent():this.get_container().find("a.jstree-clicked").parent();ret.children("a.jstree-clicked").removeClass("jstree-clicked");this.data.ui.selected=$([]);this.data.ui.last_selected=false;this.__callback({"obj":ret});}}});$.jstree.defaults.plugins.push("ui");})(jQuery);(function($){$.jstree.plugin("crrm",{__init:function(){this.get_container().bind("move_node.jstree",$.proxy(function(e,data){if(this._get_settings().crrm.move.open_onmove){var t=this;data.rslt.np.parentsUntil(".jstree").andSelf().filter(".jstree-closed").each(function(){t.open_node(this,false,true);});}},this));},defaults:{input_width_limit:200,move:{always_copy:false,open_onmove:true,default_position:"last",check_move:function(m){return true;}}},_fn:{_show_input:function(obj,callback){obj=this._get_node(obj);var rtl=this._get_settings().core.rtl,w=this._get_settings().crrm.input_width_limit,w1=obj.children("ins").width(),w2=obj.find("> a:visible > ins").width()*obj.find("> a:visible > ins").length,t=this.get_text(obj),h1=$("<div />",{css:{"position":"absolute","top":"-200px","left":(rtl?"0px":"-1000px"),"visibility":"hidden"}}).appendTo("body"),h2=obj.css("position","relative").append($("<input />",{"value":t,"class":"jstree-rename-input","css":{"padding":"0","border":"1px solid silver","position":"absolute","left":(rtl?"auto":(w1+w2+4)+"px"),"right":(rtl?(w1+w2+4)+"px":"auto"),"top":"0px","height":(this.data.core.li_height-2)+"px","lineHeight":(this.data.core.li_height-2)+"px","width":"150px"},"blur":$.proxy(function(){var i=obj.children(".jstree-rename-input"),v=i.val();if(v===""){v=t;}
-h1.remove();i.remove();this.set_text(obj,t);this.rename_node(obj,v);callback.call(this,obj,v,t);obj.css("position","");},this),"keyup":function(event){var key=event.keyCode||event.which;if(key==27){this.value=t;this.blur();return;}
-else if(key==13){this.blur();return;}
-else{h2.width(Math.min(h1.text("pW"+this.value).width(),w));}},"keypress":function(event){var key=event.keyCode||event.which;if(key==13){return false;}}})).children(".jstree-rename-input");this.set_text(obj,"");h1.css({fontFamily:h2.css('fontFamily')||'',fontSize:h2.css('fontSize')||'',fontWeight:h2.css('fontWeight')||'',fontStyle:h2.css('fontStyle')||'',fontStretch:h2.css('fontStretch')||'',fontVariant:h2.css('fontVariant')||'',letterSpacing:h2.css('letterSpacing')||'',wordSpacing:h2.css('wordSpacing')||''});h2.width(Math.min(h1.text("pW"+h2[0].value).width(),w))[0].select();},rename:function(obj){obj=this._get_node(obj);this.__rollback();var f=this.__callback;this._show_input(obj,function(obj,new_name,old_name){f.call(this,{"obj":obj,"new_name":new_name,"old_name":old_name});});},create:function(obj,position,js,callback,skip_rename){var t,_this=this;obj=this._get_node(obj);if(!obj){obj=-1;}
-this.__rollback();t=this.create_node(obj,position,js,function(t){var p=this._get_parent(t),pos=$(t).index();if(callback){callback.call(this,t);}
-if(p.length&&p.hasClass("jstree-closed")){this.open_node(p,false,true);}
-if(!skip_rename){this._show_input(t,function(obj,new_name,old_name){_this.__callback({"obj":obj,"name":new_name,"parent":p,"position":pos});});}
-else{_this.__callback({"obj":t,"name":this.get_text(t),"parent":p,"position":pos});}});return t;},remove:function(obj){obj=this._get_node(obj,true);var p=this._get_parent(obj),prev=this._get_prev(obj);this.__rollback();obj=this.delete_node(obj);if(obj!==false){this.__callback({"obj":obj,"prev":prev,"parent":p});}},check_move:function(){if(!this.__call_old()){return false;}
-var s=this._get_settings().crrm.move;if(!s.check_move.call(this,this._get_move())){return false;}
-return true;},move_node:function(obj,ref,position,is_copy,is_prepared,skip_check){var s=this._get_settings().crrm.move;if(!is_prepared){if(typeof position==="undefined"){position=s.default_position;}
-if(position==="inside"&&!s.default_position.match(/^(before|after)$/)){position=s.default_position;}
-return this.__call_old(true,obj,ref,position,is_copy,false,skip_check);}
-if(s.always_copy===true||(s.always_copy==="multitree"&&obj.rt.get_index()!==obj.ot.get_index())){is_copy=true;}
-this.__call_old(true,obj,ref,position,is_copy,true,skip_check);},cut:function(obj){obj=this._get_node(obj,true);if(!obj||!obj.length){return false;}
-this.data.crrm.cp_nodes=false;this.data.crrm.ct_nodes=obj;this.__callback({"obj":obj});},copy:function(obj){obj=this._get_node(obj,true);if(!obj||!obj.length){return false;}
-this.data.crrm.ct_nodes=false;this.data.crrm.cp_nodes=obj;this.__callback({"obj":obj});},paste:function(obj){obj=this._get_node(obj);if(!obj||!obj.length){return false;}
-var nodes=this.data.crrm.ct_nodes?this.data.crrm.ct_nodes:this.data.crrm.cp_nodes;if(!this.data.crrm.ct_nodes&&!this.data.crrm.cp_nodes){return false;}
-if(this.data.crrm.ct_nodes){this.move_node(this.data.crrm.ct_nodes,obj);this.data.crrm.ct_nodes=false;}
-if(this.data.crrm.cp_nodes){this.move_node(this.data.crrm.cp_nodes,obj,false,true);}
-this.__callback({"obj":obj,"nodes":nodes});}}});})(jQuery);(function($){var themes_loaded=[];$.jstree._themes=false;$.jstree.plugin("themes",{__init:function(){this.get_container().bind("init.jstree",$.proxy(function(){var s=this._get_settings().themes;this.data.themes.dots=s.dots;this.data.themes.icons=s.icons;this.set_theme(s.theme,s.url);},this)).bind("loaded.jstree",$.proxy(function(){if(!this.data.themes.dots){this.hide_dots();}
-else{this.show_dots();}
-if(!this.data.themes.icons){this.hide_icons();}
-else{this.show_icons();}},this));},defaults:{theme:"default",url:false,dots:true,icons:true},_fn:{set_theme:function(theme_name,theme_url){if(!theme_name){return false;}
-if(!theme_url){theme_url=$.jstree._themes+theme_name+'/style.css';}
-if($.inArray(theme_url,themes_loaded)==-1){$.vakata.css.add_sheet({"url":theme_url});themes_loaded.push(theme_url);}
-if(this.data.themes.theme!=theme_name){this.get_container().removeClass('jstree-'+this.data.themes.theme);this.data.themes.theme=theme_name;}
-this.get_container().addClass('jstree-'+theme_name);if(!this.data.themes.dots){this.hide_dots();}
-else{this.show_dots();}
-if(!this.data.themes.icons){this.hide_icons();}
-else{this.show_icons();}
-this.__callback();},get_theme:function(){return this.data.themes.theme;},show_dots:function(){this.data.themes.dots=true;this.get_container().children("ul").removeClass("jstree-no-dots");},hide_dots:function(){this.data.themes.dots=false;this.get_container().children("ul").addClass("jstree-no-dots");},toggle_dots:function(){if(this.data.themes.dots){this.hide_dots();}else{this.show_dots();}},show_icons:function(){this.data.themes.icons=true;this.get_container().children("ul").removeClass("jstree-no-icons");},hide_icons:function(){this.data.themes.icons=false;this.get_container().children("ul").addClass("jstree-no-icons");},toggle_icons:function(){if(this.data.themes.icons){this.hide_icons();}else{this.show_icons();}}}});$(function(){if($.jstree._themes===false){$("script").each(function(){if(this.src.toString().match(/jquery\.jstree[^\/]*?\.js(\?.*)?$/)){$.jstree._themes=this.src.toString().replace(/jquery\.jstree[^\/]*?\.js(\?.*)?$/,"")+'themes/';return false;}});}
-if($.jstree._themes===false){$.jstree._themes="themes/";}});$.jstree.defaults.plugins.push("themes");})(jQuery);(function($){var bound=[];function exec(i,event){var f=$.jstree._focused(),tmp;if(f&&f.data&&f.data.hotkeys&&f.data.hotkeys.enabled){tmp=f._get_settings().hotkeys[i];if(tmp){return tmp.call(f,event);}}}
-$.jstree.plugin("hotkeys",{__init:function(){if(typeof $.hotkeys==="undefined"){throw"jsTree hotkeys: jQuery hotkeys plugin not included.";}
-if(!this.data.ui){throw"jsTree hotkeys: jsTree UI plugin not included.";}
-$.each(this._get_settings().hotkeys,function(i,v){if(v!==false&&$.inArray(i,bound)==-1){$(document).bind("keydown",i,function(event){return exec(i,event);});bound.push(i);}});this.get_container().bind("lock.jstree",$.proxy(function(){if(this.data.hotkeys.enabled){this.data.hotkeys.enabled=false;this.data.hotkeys.revert=true;}},this)).bind("unlock.jstree",$.proxy(function(){if(this.data.hotkeys.revert){this.data.hotkeys.enabled=true;}},this));this.enable_hotkeys();},defaults:{"up":function(){var o=this.data.ui.hovered||this.data.ui.last_selected||-1;this.hover_node(this._get_prev(o));return false;},"ctrl+up":function(){var o=this.data.ui.hovered||this.data.ui.last_selected||-1;this.hover_node(this._get_prev(o));return false;},"shift+up":function(){var o=this.data.ui.hovered||this.data.ui.last_selected||-1;this.hover_node(this._get_prev(o));return false;},"down":function(){var o=this.data.ui.hovered||this.data.ui.last_selected||-1;this.hover_node(this._get_next(o));return false;},"ctrl+down":function(){var o=this.data.ui.hovered||this.data.ui.last_selected||-1;this.hover_node(this._get_next(o));return false;},"shift+down":function(){var o=this.data.ui.hovered||this.data.ui.last_selected||-1;this.hover_node(this._get_next(o));return false;},"left":function(){var o=this.data.ui.hovered||this.data.ui.last_selected;if(o){if(o.hasClass("jstree-open")){this.close_node(o);}
-else{this.hover_node(this._get_prev(o));}}
-return false;},"ctrl+left":function(){var o=this.data.ui.hovered||this.data.ui.last_selected;if(o){if(o.hasClass("jstree-open")){this.close_node(o);}
-else{this.hover_node(this._get_prev(o));}}
-return false;},"shift+left":function(){var o=this.data.ui.hovered||this.data.ui.last_selected;if(o){if(o.hasClass("jstree-open")){this.close_node(o);}
-else{this.hover_node(this._get_prev(o));}}
-return false;},"right":function(){var o=this.data.ui.hovered||this.data.ui.last_selected;if(o&&o.length){if(o.hasClass("jstree-closed")){this.open_node(o);}
-else{this.hover_node(this._get_next(o));}}
-return false;},"ctrl+right":function(){var o=this.data.ui.hovered||this.data.ui.last_selected;if(o&&o.length){if(o.hasClass("jstree-closed")){this.open_node(o);}
-else{this.hover_node(this._get_next(o));}}
-return false;},"shift+right":function(){var o=this.data.ui.hovered||this.data.ui.last_selected;if(o&&o.length){if(o.hasClass("jstree-closed")){this.open_node(o);}
-else{this.hover_node(this._get_next(o));}}
-return false;},"space":function(){if(this.data.ui.hovered){this.data.ui.hovered.children("a:eq(0)").click();}
-return false;},"ctrl+space":function(event){event.type="click";if(this.data.ui.hovered){this.data.ui.hovered.children("a:eq(0)").trigger(event);}
-return false;},"shift+space":function(event){event.type="click";if(this.data.ui.hovered){this.data.ui.hovered.children("a:eq(0)").trigger(event);}
-return false;},"f2":function(){this.rename(this.data.ui.hovered||this.data.ui.last_selected);},"del":function(){this.remove(this.data.ui.hovered||this._get_node(null));}},_fn:{enable_hotkeys:function(){this.data.hotkeys.enabled=true;},disable_hotkeys:function(){this.data.hotkeys.enabled=false;}}});})(jQuery);(function($){$.jstree.plugin("json_data",{__init:function(){var s=this._get_settings().json_data;if(s.progressive_unload){this.get_container().bind("after_close.jstree",function(e,data){data.rslt.obj.children("ul").remove();});}},defaults:{data:false,ajax:false,correct_state:true,progressive_render:false,progressive_unload:false},_fn:{load_node:function(obj,s_call,e_call){var _this=this;this.load_node_json(obj,function(){_this.__callback({"obj":_this._get_node(obj)});s_call.call(this);},e_call);},_is_loaded:function(obj){var s=this._get_settings().json_data;obj=this._get_node(obj);return obj==-1||!obj||(!s.ajax&&!s.progressive_render&&!$.isFunction(s.data))||obj.is(".jstree-open, .jstree-leaf")||obj.children("ul").children("li").length>0;},refresh:function(obj){obj=this._get_node(obj);var s=this._get_settings().json_data;if(obj&&obj!==-1&&s.progressive_unload&&($.isFunction(s.data)||!!s.ajax)){obj.removeData("jstree_children");}
-return this.__call_old();},load_node_json:function(obj,s_call,e_call){var s=this.get_settings().json_data,d,error_func=function(){},success_func=function(){};obj=this._get_node(obj);if(obj&&obj!==-1&&(s.progressive_render||s.progressive_unload)&&!obj.is(".jstree-open, .jstree-leaf")&&obj.children("ul").children("li").length===0&&obj.data("jstree_children")){d=this._parse_json(obj.data("jstree_children"),obj);if(d){obj.append(d);if(!s.progressive_unload){obj.removeData("jstree_children");}}
-this.clean_node(obj);if(s_call){s_call.call(this);}
-return;}
-if(obj&&obj!==-1){if(obj.data("jstree_is_loading")){return;}
-else{obj.data("jstree_is_loading",true);}}
-switch(!0){case(!s.data&&!s.ajax):throw"Neither data nor ajax settings supplied.";case($.isFunction(s.data)):s.data.call(this,obj,$.proxy(function(d){d=this._parse_json(d,obj);if(!d){if(obj===-1||!obj){if(s.correct_state){this.get_container().children("ul").empty();}}
-else{obj.children("a.jstree-loading").removeClass("jstree-loading");obj.removeData("jstree_is_loading");if(s.correct_state){this.correct_state(obj);}}
-if(e_call){e_call.call(this);}}
-else{if(obj===-1||!obj){this.get_container().children("ul").empty().append(d.children());}
-else{obj.append(d).children("a.jstree-loading").removeClass("jstree-loading");obj.removeData("jstree_is_loading");}
-this.clean_node(obj);if(s_call){s_call.call(this);}}},this));break;case(!!s.data&&!s.ajax)||(!!s.data&&!!s.ajax&&(!obj||obj===-1)):if(!obj||obj==-1){d=this._parse_json(s.data,obj);if(d){this.get_container().children("ul").empty().append(d.children());this.clean_node();}
-else{if(s.correct_state){this.get_container().children("ul").empty();}}}
-if(s_call){s_call.call(this);}
-break;case(!s.data&&!!s.ajax)||(!!s.data&&!!s.ajax&&obj&&obj!==-1):error_func=function(x,t,e){var ef=this.get_settings().json_data.ajax.error;if(ef){ef.call(this,x,t,e);}
-if(obj!=-1&&obj.length){obj.children("a.jstree-loading").removeClass("jstree-loading");obj.removeData("jstree_is_loading");if(t==="success"&&s.correct_state){this.correct_state(obj);}}
-else{if(t==="success"&&s.correct_state){this.get_container().children("ul").empty();}}
-if(e_call){e_call.call(this);}};success_func=function(d,t,x){var sf=this.get_settings().json_data.ajax.success;if(sf){d=sf.call(this,d,t,x)||d;}
-if(d===""||(d&&d.toString&&d.toString().replace(/^[\s\n]+$/,"")==="")||(!$.isArray(d)&&!$.isPlainObject(d))){return error_func.call(this,x,t,"");}
-d=this._parse_json(d,obj);if(d){if(obj===-1||!obj){this.get_container().children("ul").empty().append(d.children());}
-else{obj.append(d).children("a.jstree-loading").removeClass("jstree-loading");obj.removeData("jstree_is_loading");}
-this.clean_node(obj);if(s_call){s_call.call(this);}}
-else{if(obj===-1||!obj){if(s.correct_state){this.get_container().children("ul").empty();if(s_call){s_call.call(this);}}}
-else{obj.children("a.jstree-loading").removeClass("jstree-loading");obj.removeData("jstree_is_loading");if(s.correct_state){this.correct_state(obj);if(s_call){s_call.call(this);}}}}};s.ajax.context=this;s.ajax.error=error_func;s.ajax.success=success_func;if(!s.ajax.dataType){s.ajax.dataType="json";}
-if($.isFunction(s.ajax.url)){s.ajax.url=s.ajax.url.call(this,obj);}
-if($.isFunction(s.ajax.data)){s.ajax.data=s.ajax.data.call(this,obj);}
-$.ajax(s.ajax);break;}},_parse_json:function(js,obj,is_callback){var d=false,p=this._get_settings(),s=p.json_data,t=p.core.html_titles,tmp,i,j,ul1,ul2;if(!js){return d;}
-if(s.progressive_unload&&obj&&obj!==-1){obj.data("jstree_children",d);}
-if($.isArray(js)){d=$();if(!js.length){return false;}
-for(i=0,j=js.length;i<j;i++){tmp=this._parse_json(js[i],obj,true);if(tmp.length){d=d.add(tmp);}}}
-else{if(typeof js=="string"){js={data:js};}
-if(!js.data&&js.data!==""){return d;}
-d=$("<li />");if(js.attr){d.attr(js.attr);}
-if(js.metadata){d.data(js.metadata);}
-if(js.state){d.addClass("jstree-"+js.state);}
-if(!$.isArray(js.data)){tmp=js.data;js.data=[];js.data.push(tmp);}
-$.each(js.data,function(i,m){tmp=$("<a />");if($.isFunction(m)){m=m.call(this,js);}
-if(typeof m=="string"){tmp.attr('href','#')[t?"html":"text"](m);}
-else{if(!m.attr){m.attr={};}
-if(!m.attr.href){m.attr.href='#';}
-tmp.attr(m.attr)[t?"html":"text"](m.title);if(m.language){tmp.addClass(m.language);}}
-tmp.prepend("<ins class='jstree-icon'>&#160;</ins>");if(!m.icon&&js.icon){m.icon=js.icon;}
-if(m.icon){if(m.icon.indexOf("/")===-1){tmp.children("ins").addClass(m.icon);}
-else{tmp.children("ins").css("background","url('"+m.icon+"') center center no-repeat");}}
-d.append(tmp);});d.prepend("<ins class='jstree-icon'>&#160;</ins>");if(js.children){if(s.progressive_render&&js.state!=="open"){d.addClass("jstree-closed").data("jstree_children",js.children);}
-else{if(s.progressive_unload){d.data("jstree_children",js.children);}
-if($.isArray(js.children)&&js.children.length){tmp=this._parse_json(js.children,obj,true);if(tmp.length){ul2=$("<ul />");ul2.append(tmp);d.append(ul2);}}}}}
-if(!is_callback){ul1=$("<ul />");ul1.append(d);d=ul1;}
-return d;},get_json:function(obj,li_attr,a_attr,is_callback){var result=[],s=this._get_settings(),_this=this,tmp1,tmp2,li,a,t,lang;obj=this._get_node(obj);if(!obj||obj===-1){obj=this.get_container().find("> ul > li");}
-li_attr=$.isArray(li_attr)?li_attr:["id","class"];if(!is_callback&&this.data.types){li_attr.push(s.types.type_attr);}
-a_attr=$.isArray(a_attr)?a_attr:[];obj.each(function(){li=$(this);tmp1={data:[]};if(li_attr.length){tmp1.attr={};}
-$.each(li_attr,function(i,v){tmp2=li.attr(v);if(tmp2&&tmp2.length&&tmp2.replace(/jstree[^ ]*/ig,'').length){tmp1.attr[v]=(" "+tmp2).replace(/ jstree[^ ]*/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,"");}});if(li.hasClass("jstree-open")){tmp1.state="open";}
-if(li.hasClass("jstree-closed")){tmp1.state="closed";}
-if(li.data()){tmp1.metadata=li.data();}
-a=li.children("a");a.each(function(){t=$(this);if(a_attr.length||$.inArray("languages",s.plugins)!==-1||t.children("ins").get(0).style.backgroundImage.length||(t.children("ins").get(0).className&&t.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,'').length)){lang=false;if($.inArray("languages",s.plugins)!==-1&&$.isArray(s.languages)&&s.languages.length){$.each(s.languages,function(l,lv){if(t.hasClass(lv)){lang=lv;return false;}});}
-tmp2={attr:{},title:_this.get_text(t,lang)};$.each(a_attr,function(k,z){tmp2.attr[z]=(" "+(t.attr(z)||"")).replace(/ jstree[^ ]*/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,"");});if($.inArray("languages",s.plugins)!==-1&&$.isArray(s.languages)&&s.languages.length){$.each(s.languages,function(k,z){if(t.hasClass(z)){tmp2.language=z;return true;}});}
-if(t.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,'').replace(/^\s+$/ig,"").length){tmp2.icon=t.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,"");}
-if(t.children("ins").get(0).style.backgroundImage.length){tmp2.icon=t.children("ins").get(0).style.backgroundImage.replace("url(","").replace(")","");}}
-else{tmp2=_this.get_text(t);}
-if(a.length>1){tmp1.data.push(tmp2);}
-else{tmp1.data=tmp2;}});li=li.find("> ul > li");if(li.length){tmp1.children=_this.get_json(li,li_attr,a_attr,true);}
-result.push(tmp1);});return result;}}});})(jQuery);(function($){$.jstree.plugin("languages",{__init:function(){this._load_css();},defaults:[],_fn:{set_lang:function(i){var langs=this._get_settings().languages,st=false,selector=".jstree-"+this.get_index()+' a';if(!$.isArray(langs)||langs.length===0){return false;}
-if($.inArray(i,langs)==-1){if(!!langs[i]){i=langs[i];}
-else{return false;}}
-if(i==this.data.languages.current_language){return true;}
-st=$.vakata.css.get_css(selector+"."+this.data.languages.current_language,false,this.data.languages.language_css);if(st!==false){st.style.display="none";}
-st=$.vakata.css.get_css(selector+"."+i,false,this.data.languages.language_css);if(st!==false){st.style.display="";}
-this.data.languages.current_language=i;this.__callback(i);return true;},get_lang:function(){return this.data.languages.current_language;},_get_string:function(key,lang){var langs=this._get_settings().languages,s=this._get_settings().core.strings;if($.isArray(langs)&&langs.length){lang=(lang&&$.inArray(lang,langs)!=-1)?lang:this.data.languages.current_language;}
-if(s[lang]&&s[lang][key]){return s[lang][key];}
-if(s[key]){return s[key];}
-return key;},get_text:function(obj,lang){obj=this._get_node(obj)||this.data.ui.last_selected;if(!obj.size()){return false;}
-var langs=this._get_settings().languages,s=this._get_settings().core.html_titles;if($.isArray(langs)&&langs.length){lang=(lang&&$.inArray(lang,langs)!=-1)?lang:this.data.languages.current_language;obj=obj.children("a."+lang);}
-else{obj=obj.children("a:eq(0)");}
-if(s){obj=obj.clone();obj.children("INS").remove();return obj.html();}
-else{obj=obj.contents().filter(function(){return this.nodeType==3;})[0];return obj.nodeValue;}},set_text:function(obj,val,lang){obj=this._get_node(obj)||this.data.ui.last_selected;if(!obj.size()){return false;}
-var langs=this._get_settings().languages,s=this._get_settings().core.html_titles,tmp;if($.isArray(langs)&&langs.length){lang=(lang&&$.inArray(lang,langs)!=-1)?lang:this.data.languages.current_language;obj=obj.children("a."+lang);}
-else{obj=obj.children("a:eq(0)");}
-if(s){tmp=obj.children("INS").clone();obj.html(val).prepend(tmp);this.__callback({"obj":obj,"name":val,"lang":lang});return true;}
-else{obj=obj.contents().filter(function(){return this.nodeType==3;})[0];this.__callback({"obj":obj,"name":val,"lang":lang});return(obj.nodeValue=val);}},_load_css:function(){var langs=this._get_settings().languages,str="/* languages css */",selector=".jstree-"+this.get_index()+' a',ln;if($.isArray(langs)&&langs.length){this.data.languages.current_language=langs[0];for(ln=0;ln<langs.length;ln++){str+=selector+"."+langs[ln]+" {";if(langs[ln]!=this.data.languages.current_language){str+=" display:none; ";}
-str+=" } ";}
-this.data.languages.language_css=$.vakata.css.add_sheet({'str':str,'title':"jstree-languages"});}},create_node:function(obj,position,js,callback){var t=this.__call_old(true,obj,position,js,function(t){var langs=this._get_settings().languages,a=t.children("a"),ln;if($.isArray(langs)&&langs.length){for(ln=0;ln<langs.length;ln++){if(!a.is("."+langs[ln])){t.append(a.eq(0).clone().removeClass(langs.join(" ")).addClass(langs[ln]));}}
-a.not("."+langs.join(", .")).remove();}
-if(callback){callback.call(this,t);}});return t;}}});})(jQuery);(function($){$.jstree.plugin("cookies",{__init:function(){if(typeof $.cookie==="undefined"){throw"jsTree cookie: jQuery cookie plugin not included.";}
-var s=this._get_settings().cookies,tmp;if(!!s.save_loaded){tmp=$.cookie(s.save_loaded);if(tmp&&tmp.length){this.data.core.to_load=tmp.split(",");}}
-if(!!s.save_opened){tmp=$.cookie(s.save_opened);if(tmp&&tmp.length){this.data.core.to_open=tmp.split(",");}}
-if(!!s.save_selected){tmp=$.cookie(s.save_selected);if(tmp&&tmp.length&&this.data.ui){this.data.ui.to_select=tmp.split(",");}}
-this.get_container().one((this.data.ui?"reselect":"reopen")+".jstree",$.proxy(function(){this.get_container().bind("open_node.jstree close_node.jstree select_node.jstree deselect_node.jstree",$.proxy(function(e){if(this._get_settings().cookies.auto_save){this.save_cookie((e.handleObj.namespace+e.handleObj.type).replace("jstree",""));}},this));},this));},defaults:{save_loaded:"jstree_load",save_opened:"jstree_open",save_selected:"jstree_select",auto_save:true,cookie_options:{}},_fn:{save_cookie:function(c){if(this.data.core.refreshing){return;}
-var s=this._get_settings().cookies;if(!c){if(s.save_loaded){this.save_loaded();$.cookie(s.save_loaded,this.data.core.to_load.join(","),s.cookie_options);}
-if(s.save_opened){this.save_opened();$.cookie(s.save_opened,this.data.core.to_open.join(","),s.cookie_options);}
-if(s.save_selected&&this.data.ui){this.save_selected();$.cookie(s.save_selected,this.data.ui.to_select.join(","),s.cookie_options);}
-return;}
-switch(c){case"open_node":case"close_node":if(!!s.save_opened){this.save_opened();$.cookie(s.save_opened,this.data.core.to_open.join(","),s.cookie_options);}
-if(!!s.save_loaded){this.save_loaded();$.cookie(s.save_loaded,this.data.core.to_load.join(","),s.cookie_options);}
-break;case"select_node":case"deselect_node":if(!!s.save_selected&&this.data.ui){this.save_selected();$.cookie(s.save_selected,this.data.ui.to_select.join(","),s.cookie_options);}
-break;}}}});})(jQuery);(function($){$.jstree.plugin("sort",{__init:function(){this.get_container().bind("load_node.jstree",$.proxy(function(e,data){var obj=this._get_node(data.rslt.obj);obj=obj===-1?this.get_container().children("ul"):obj.children("ul");this.sort(obj);},this)).bind("rename_node.jstree create_node.jstree create.jstree",$.proxy(function(e,data){this.sort(data.rslt.obj.parent());},this)).bind("move_node.jstree",$.proxy(function(e,data){var m=data.rslt.np==-1?this.get_container():data.rslt.np;this.sort(m.children("ul"));},this));},defaults:function(a,b){return this.get_text(a)>this.get_text(b)?1:-1;},_fn:{sort:function(obj){var s=this._get_settings().sort,t=this;obj.append($.makeArray(obj.children("li")).sort($.proxy(s,t)));obj.find("> li > ul").each(function(){t.sort($(this));});this.clean_node(obj);}}});})(jQuery);(function($){var o=false,r=false,m=false,ml=false,sli=false,sti=false,dir1=false,dir2=false,last_pos=false;$.vakata.dnd={is_down:false,is_drag:false,helper:false,scroll_spd:10,init_x:0,init_y:0,threshold:5,helper_left:5,helper_top:10,user_data:{},drag_start:function(e,data,html){if($.vakata.dnd.is_drag){$.vakata.drag_stop({});}
-try{e.currentTarget.unselectable="on";e.currentTarget.onselectstart=function(){return false;};if(e.currentTarget.style){e.currentTarget.style.MozUserSelect="none";}}catch(err){}
-$.vakata.dnd.init_x=e.pageX;$.vakata.dnd.init_y=e.pageY;$.vakata.dnd.user_data=data;$.vakata.dnd.is_down=true;$.vakata.dnd.helper=$("<div id='vakata-dragged' />").html(html);$(document).bind("mousemove",$.vakata.dnd.drag);$(document).bind("mouseup",$.vakata.dnd.drag_stop);return false;},drag:function(e){if(!$.vakata.dnd.is_down){return;}
-if(!$.vakata.dnd.is_drag){if(Math.abs(e.pageX-$.vakata.dnd.init_x)>5||Math.abs(e.pageY-$.vakata.dnd.init_y)>5){$.vakata.dnd.helper.appendTo("body");$.vakata.dnd.is_drag=true;$(document).triggerHandler("drag_start.vakata",{"event":e,"data":$.vakata.dnd.user_data});}
-else{return;}}
-if(e.type==="mousemove"){var d=$(document),t=d.scrollTop(),l=d.scrollLeft();if(e.pageY-t<20){if(sti&&dir1==="down"){clearInterval(sti);sti=false;}
-if(!sti){dir1="up";sti=setInterval(function(){$(document).scrollTop($(document).scrollTop()-$.vakata.dnd.scroll_spd);},150);}}
-else{if(sti&&dir1==="up"){clearInterval(sti);sti=false;}}
-if($(window).height()-(e.pageY-t)<20){if(sti&&dir1==="up"){clearInterval(sti);sti=false;}
-if(!sti){dir1="down";sti=setInterval(function(){$(document).scrollTop($(document).scrollTop()+$.vakata.dnd.scroll_spd);},150);}}
-else{if(sti&&dir1==="down"){clearInterval(sti);sti=false;}}
-if(e.pageX-l<20){if(sli&&dir2==="right"){clearInterval(sli);sli=false;}
-if(!sli){dir2="left";sli=setInterval(function(){$(document).scrollLeft($(document).scrollLeft()-$.vakata.dnd.scroll_spd);},150);}}
-else{if(sli&&dir2==="left"){clearInterval(sli);sli=false;}}
-if($(window).width()-(e.pageX-l)<20){if(sli&&dir2==="left"){clearInterval(sli);sli=false;}
-if(!sli){dir2="right";sli=setInterval(function(){$(document).scrollLeft($(document).scrollLeft()+$.vakata.dnd.scroll_spd);},150);}}
-else{if(sli&&dir2==="right"){clearInterval(sli);sli=false;}}}
-$.vakata.dnd.helper.css({left:(e.pageX+$.vakata.dnd.helper_left)+"px",top:(e.pageY+$.vakata.dnd.helper_top)+"px"});$(document).triggerHandler("drag.vakata",{"event":e,"data":$.vakata.dnd.user_data});},drag_stop:function(e){if(sli){clearInterval(sli);}
-if(sti){clearInterval(sti);}
-$(document).unbind("mousemove",$.vakata.dnd.drag);$(document).unbind("mouseup",$.vakata.dnd.drag_stop);$(document).triggerHandler("drag_stop.vakata",{"event":e,"data":$.vakata.dnd.user_data});$.vakata.dnd.helper.remove();$.vakata.dnd.init_x=0;$.vakata.dnd.init_y=0;$.vakata.dnd.user_data={};$.vakata.dnd.is_down=false;$.vakata.dnd.is_drag=false;}};$(function(){var css_string='#vakata-dragged { display:block; margin:0 0 0 0; padding:4px 4px 4px 24px; position:absolute; top:-2000px; line-height:16px; z-index:10000; } ';$.vakata.css.add_sheet({str:css_string,title:"vakata"});});$.jstree.plugin("dnd",{__init:function(){this.data.dnd={active:false,after:false,inside:false,before:false,off:false,prepared:false,w:0,to1:false,to2:false,cof:false,cw:false,ch:false,i1:false,i2:false,mto:false};this.get_container().bind("mouseenter.jstree",$.proxy(function(e){if($.vakata.dnd.is_drag&&$.vakata.dnd.user_data.jstree){if(this.data.themes){m.attr("class","jstree-"+this.data.themes.theme);if(ml){ml.attr("class","jstree-"+this.data.themes.theme);}
-$.vakata.dnd.helper.attr("class","jstree-dnd-helper jstree-"+this.data.themes.theme);}
-if(e.currentTarget===e.target&&$.vakata.dnd.user_data.obj&&$($.vakata.dnd.user_data.obj).length&&$($.vakata.dnd.user_data.obj).parents(".jstree:eq(0)")[0]!==e.target){var tr=$.jstree._reference(e.target),dc;if(tr.data.dnd.foreign){dc=tr._get_settings().dnd.drag_check.call(this,{"o":o,"r":tr.get_container(),is_root:true});if(dc===true||dc.inside===true||dc.before===true||dc.after===true){$.vakata.dnd.helper.children("ins").attr("class","jstree-ok");}}
-else{tr.prepare_move(o,tr.get_container(),"last");if(tr.check_move()){$.vakata.dnd.helper.children("ins").attr("class","jstree-ok");}}}}},this)).bind("mouseup.jstree",$.proxy(function(e){if($.vakata.dnd.is_drag&&$.vakata.dnd.user_data.jstree&&e.currentTarget===e.target&&$.vakata.dnd.user_data.obj&&$($.vakata.dnd.user_data.obj).length&&$($.vakata.dnd.user_data.obj).parents(".jstree:eq(0)")[0]!==e.target){var tr=$.jstree._reference(e.currentTarget),dc;if(tr.data.dnd.foreign){dc=tr._get_settings().dnd.drag_check.call(this,{"o":o,"r":tr.get_container(),is_root:true});if(dc===true||dc.inside===true||dc.before===true||dc.after===true){tr._get_settings().dnd.drag_finish.call(this,{"o":o,"r":tr.get_container(),is_root:true});}}
-else{tr.move_node(o,tr.get_container(),"last",e[tr._get_settings().dnd.copy_modifier+"Key"]);}}},this)).bind("mouseleave.jstree",$.proxy(function(e){if(e.relatedTarget&&e.relatedTarget.id&&e.relatedTarget.id==="jstree-marker-line"){return false;}
-if($.vakata.dnd.is_drag&&$.vakata.dnd.user_data.jstree){if(this.data.dnd.i1){clearInterval(this.data.dnd.i1);}
-if(this.data.dnd.i2){clearInterval(this.data.dnd.i2);}
-if(this.data.dnd.to1){clearTimeout(this.data.dnd.to1);}
-if(this.data.dnd.to2){clearTimeout(this.data.dnd.to2);}
-if($.vakata.dnd.helper.children("ins").hasClass("jstree-ok")){$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");}}},this)).bind("mousemove.jstree",$.proxy(function(e){if($.vakata.dnd.is_drag&&$.vakata.dnd.user_data.jstree){var cnt=this.get_container()[0];if(e.pageX+24>this.data.dnd.cof.left+this.data.dnd.cw){if(this.data.dnd.i1){clearInterval(this.data.dnd.i1);}
-this.data.dnd.i1=setInterval($.proxy(function(){this.scrollLeft+=$.vakata.dnd.scroll_spd;},cnt),100);}
-else if(e.pageX-24<this.data.dnd.cof.left){if(this.data.dnd.i1){clearInterval(this.data.dnd.i1);}
-this.data.dnd.i1=setInterval($.proxy(function(){this.scrollLeft-=$.vakata.dnd.scroll_spd;},cnt),100);}
-else{if(this.data.dnd.i1){clearInterval(this.data.dnd.i1);}}
-if(e.pageY+24>this.data.dnd.cof.top+this.data.dnd.ch){if(this.data.dnd.i2){clearInterval(this.data.dnd.i2);}
-this.data.dnd.i2=setInterval($.proxy(function(){this.scrollTop+=$.vakata.dnd.scroll_spd;},cnt),100);}
-else if(e.pageY-24<this.data.dnd.cof.top){if(this.data.dnd.i2){clearInterval(this.data.dnd.i2);}
-this.data.dnd.i2=setInterval($.proxy(function(){this.scrollTop-=$.vakata.dnd.scroll_spd;},cnt),100);}
-else{if(this.data.dnd.i2){clearInterval(this.data.dnd.i2);}}}},this)).bind("scroll.jstree",$.proxy(function(e){if($.vakata.dnd.is_drag&&$.vakata.dnd.user_data.jstree&&m&&ml){m.hide();ml.hide();}},this)).delegate("a","mousedown.jstree",$.proxy(function(e){if(e.which===1){this.start_drag(e.currentTarget,e);return false;}},this)).delegate("a","mouseenter.jstree",$.proxy(function(e){if($.vakata.dnd.is_drag&&$.vakata.dnd.user_data.jstree){this.dnd_enter(e.currentTarget);}},this)).delegate("a","mousemove.jstree",$.proxy(function(e){if($.vakata.dnd.is_drag&&$.vakata.dnd.user_data.jstree){if(!r||!r.length||r.children("a")[0]!==e.currentTarget){this.dnd_enter(e.currentTarget);}
-if(typeof this.data.dnd.off.top==="undefined"){this.data.dnd.off=$(e.target).offset();}
-this.data.dnd.w=(e.pageY-(this.data.dnd.off.top||0))%this.data.core.li_height;if(this.data.dnd.w<0){this.data.dnd.w+=this.data.core.li_height;}
-this.dnd_show();}},this)).delegate("a","mouseleave.jstree",$.proxy(function(e){if($.vakata.dnd.is_drag&&$.vakata.dnd.user_data.jstree){if(e.relatedTarget&&e.relatedTarget.id&&e.relatedTarget.id==="jstree-marker-line"){return false;}
-if(m){m.hide();}
-if(ml){ml.hide();}
-this.data.dnd.mto=setTimeout((function(t){return function(){t.dnd_leave(e);};})(this),0);}},this)).delegate("a","mouseup.jstree",$.proxy(function(e){if($.vakata.dnd.is_drag&&$.vakata.dnd.user_data.jstree){this.dnd_finish(e);}},this));$(document).bind("drag_stop.vakata",$.proxy(function(){if(this.data.dnd.to1){clearTimeout(this.data.dnd.to1);}
-if(this.data.dnd.to2){clearTimeout(this.data.dnd.to2);}
-if(this.data.dnd.i1){clearInterval(this.data.dnd.i1);}
-if(this.data.dnd.i2){clearInterval(this.data.dnd.i2);}
-this.data.dnd.after=false;this.data.dnd.before=false;this.data.dnd.inside=false;this.data.dnd.off=false;this.data.dnd.prepared=false;this.data.dnd.w=false;this.data.dnd.to1=false;this.data.dnd.to2=false;this.data.dnd.i1=false;this.data.dnd.i2=false;this.data.dnd.active=false;this.data.dnd.foreign=false;if(m){m.css({"top":"-2000px"});}
-if(ml){ml.css({"top":"-2000px"});}},this)).bind("drag_start.vakata",$.proxy(function(e,data){if(data.data.jstree){var et=$(data.event.target);if(et.closest(".jstree").hasClass("jstree-"+this.get_index())){this.dnd_enter(et);}}},this));var s=this._get_settings().dnd;if(s.drag_target){$(document).delegate(s.drag_target,"mousedown.jstree-"+this.get_index(),$.proxy(function(e){o=e.target;$.vakata.dnd.drag_start(e,{jstree:true,obj:e.target},"<ins class='jstree-icon'></ins>"+$(e.target).text());if(this.data.themes){if(m){m.attr("class","jstree-"+this.data.themes.theme);}
-if(ml){ml.attr("class","jstree-"+this.data.themes.theme);}
-$.vakata.dnd.helper.attr("class","jstree-dnd-helper jstree-"+this.data.themes.theme);}
-$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");var cnt=this.get_container();this.data.dnd.cof=cnt.offset();this.data.dnd.cw=parseInt(cnt.width(),10);this.data.dnd.ch=parseInt(cnt.height(),10);this.data.dnd.foreign=true;e.preventDefault();},this));}
-if(s.drop_target){$(document).delegate(s.drop_target,"mouseenter.jstree-"+this.get_index(),$.proxy(function(e){if(this.data.dnd.active&&this._get_settings().dnd.drop_check.call(this,{"o":o,"r":$(e.target),"e":e})){$.vakata.dnd.helper.children("ins").attr("class","jstree-ok");}},this)).delegate(s.drop_target,"mouseleave.jstree-"+this.get_index(),$.proxy(function(e){if(this.data.dnd.active){$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");}},this)).delegate(s.drop_target,"mouseup.jstree-"+this.get_index(),$.proxy(function(e){if(this.data.dnd.active&&$.vakata.dnd.helper.children("ins").hasClass("jstree-ok")){this._get_settings().dnd.drop_finish.call(this,{"o":o,"r":$(e.target),"e":e});}},this));}},defaults:{copy_modifier:"ctrl",check_timeout:100,open_timeout:500,drop_target:".jstree-drop",drop_check:function(data){return true;},drop_finish:$.noop,drag_target:".jstree-draggable",drag_finish:$.noop,drag_check:function(data){return{after:false,before:false,inside:true};}},_fn:{dnd_prepare:function(){if(!r||!r.length){return;}
-this.data.dnd.off=r.offset();if(this._get_settings().core.rtl){this.data.dnd.off.right=this.data.dnd.off.left+r.width();}
-if(this.data.dnd.foreign){var a=this._get_settings().dnd.drag_check.call(this,{"o":o,"r":r});this.data.dnd.after=a.after;this.data.dnd.before=a.before;this.data.dnd.inside=a.inside;this.data.dnd.prepared=true;return this.dnd_show();}
-this.prepare_move(o,r,"before");this.data.dnd.before=this.check_move();this.prepare_move(o,r,"after");this.data.dnd.after=this.check_move();if(this._is_loaded(r)){this.prepare_move(o,r,"inside");this.data.dnd.inside=this.check_move();}
-else{this.data.dnd.inside=false;}
-this.data.dnd.prepared=true;return this.dnd_show();},dnd_show:function(){if(!this.data.dnd.prepared){return;}
-var o=["before","inside","after"],r=false,rtl=this._get_settings().core.rtl,pos;if(this.data.dnd.w<this.data.core.li_height/3){o=["before","inside","after"];}
-else if(this.data.dnd.w<=this.data.core.li_height*2/3){o=this.data.dnd.w<this.data.core.li_height/2?["inside","before","after"]:["inside","after","before"];}
-else{o=["after","inside","before"];}
-$.each(o,$.proxy(function(i,val){if(this.data.dnd[val]){$.vakata.dnd.helper.children("ins").attr("class","jstree-ok");r=val;return false;}},this));if(r===false){$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");}
-pos=rtl?(this.data.dnd.off.right-18):(this.data.dnd.off.left+10);switch(r){case"before":m.css({"left":pos+"px","top":(this.data.dnd.off.top-6)+"px"}).show();if(ml){ml.css({"left":(pos+8)+"px","top":(this.data.dnd.off.top-1)+"px"}).show();}
-break;case"after":m.css({"left":pos+"px","top":(this.data.dnd.off.top+this.data.core.li_height-6)+"px"}).show();if(ml){ml.css({"left":(pos+8)+"px","top":(this.data.dnd.off.top+this.data.core.li_height-1)+"px"}).show();}
-break;case"inside":m.css({"left":pos+(rtl?-4:4)+"px","top":(this.data.dnd.off.top+this.data.core.li_height/2-5)+"px"}).show();if(ml){ml.hide();}
-break;default:m.hide();if(ml){ml.hide();}
-break;}
-last_pos=r;return r;},dnd_open:function(){this.data.dnd.to2=false;this.open_node(r,$.proxy(this.dnd_prepare,this),true);},dnd_finish:function(e){if(this.data.dnd.foreign){if(this.data.dnd.after||this.data.dnd.before||this.data.dnd.inside){this._get_settings().dnd.drag_finish.call(this,{"o":o,"r":r,"p":last_pos});}}
-else{this.dnd_prepare();this.move_node(o,r,last_pos,e[this._get_settings().dnd.copy_modifier+"Key"]);}
-o=false;r=false;m.hide();if(ml){ml.hide();}},dnd_enter:function(obj){if(this.data.dnd.mto){clearTimeout(this.data.dnd.mto);this.data.dnd.mto=false;}
-var s=this._get_settings().dnd;this.data.dnd.prepared=false;r=this._get_node(obj);if(s.check_timeout){if(this.data.dnd.to1){clearTimeout(this.data.dnd.to1);}
-this.data.dnd.to1=setTimeout($.proxy(this.dnd_prepare,this),s.check_timeout);}
-else{this.dnd_prepare();}
-if(s.open_timeout){if(this.data.dnd.to2){clearTimeout(this.data.dnd.to2);}
-if(r&&r.length&&r.hasClass("jstree-closed")){this.data.dnd.to2=setTimeout($.proxy(this.dnd_open,this),s.open_timeout);}}
-else{if(r&&r.length&&r.hasClass("jstree-closed")){this.dnd_open();}}},dnd_leave:function(e){this.data.dnd.after=false;this.data.dnd.before=false;this.data.dnd.inside=false;$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");m.hide();if(ml){ml.hide();}
-if(r&&r[0]===e.target.parentNode){if(this.data.dnd.to1){clearTimeout(this.data.dnd.to1);this.data.dnd.to1=false;}
-if(this.data.dnd.to2){clearTimeout(this.data.dnd.to2);this.data.dnd.to2=false;}}},start_drag:function(obj,e){o=this._get_node(obj);if(this.data.ui&&this.is_selected(o)){o=this._get_node(null,true);}
-var dt=o.length>1?this._get_string("multiple_selection"):this.get_text(o),cnt=this.get_container();if(!this._get_settings().core.html_titles){dt=dt.replace(/</ig,"&lt;").replace(/>/ig,"&gt;");}
-$.vakata.dnd.drag_start(e,{jstree:true,obj:o},"<ins class='jstree-icon'></ins>"+dt);if(this.data.themes){if(m){m.attr("class","jstree-"+this.data.themes.theme);}
-if(ml){ml.attr("class","jstree-"+this.data.themes.theme);}
-$.vakata.dnd.helper.attr("class","jstree-dnd-helper jstree-"+this.data.themes.theme);}
-this.data.dnd.cof=cnt.offset();this.data.dnd.cw=parseInt(cnt.width(),10);this.data.dnd.ch=parseInt(cnt.height(),10);this.data.dnd.active=true;}}});$(function(){var css_string=''+'#vakata-dragged ins { display:block; text-decoration:none; width:16px; height:16px; margin:0 0 0 0; padding:0; position:absolute; top:4px; left:4px; '+' -moz-border-radius:4px; border-radius:4px; -webkit-border-radius:4px; '+'} '+'#vakata-dragged .jstree-ok { background:green; } '+'#vakata-dragged .jstree-invalid { background:red; } '+'#jstree-marker { padding:0; margin:0; font-size:12px; overflow:hidden; height:12px; width:8px; position:absolute; top:-30px; z-index:10001; background-repeat:no-repeat; display:none; background-color:transparent; text-shadow:1px 1px 1px white; color:black; line-height:10px; } '+'#jstree-marker-line { padding:0; margin:0; line-height:0%; font-size:1px; overflow:hidden; height:1px; width:100px; position:absolute; top:-30px; z-index:10000; background-repeat:no-repeat; display:none; background-color:#456c43; '+' cursor:pointer; border:1px solid #eeeeee; border-left:0; -moz-box-shadow: 0px 0px 2px #666; -webkit-box-shadow: 0px 0px 2px #666; box-shadow: 0px 0px 2px #666; '+' -moz-border-radius:1px; border-radius:1px; -webkit-border-radius:1px; '+'}'+'';$.vakata.css.add_sheet({str:css_string,title:"jstree"});m=$("<div />").attr({id:"jstree-marker"}).hide().html("&raquo;").bind("mouseleave mouseenter",function(e){m.hide();ml.hide();e.preventDefault();e.stopImmediatePropagation();return false;}).appendTo("body");ml=$("<div />").attr({id:"jstree-marker-line"}).hide().bind("mouseup",function(e){if(r&&r.length){r.children("a").trigger(e);e.preventDefault();e.stopImmediatePropagation();return false;}}).bind("mouseleave",function(e){var rt=$(e.relatedTarget);if(rt.is(".jstree")||rt.closest(".jstree").length===0){if(r&&r.length){r.children("a").trigger(e);m.hide();ml.hide();e.preventDefault();e.stopImmediatePropagation();return false;}}}).appendTo("body");$(document).bind("drag_start.vakata",function(e,data){if(data.data.jstree){m.show();if(ml){ml.show();}}});$(document).bind("drag_stop.vakata",function(e,data){if(data.data.jstree){m.hide();if(ml){ml.hide();}}});});})(jQuery);(function($){$.jstree.plugin("checkbox",{__init:function(){this.data.checkbox.noui=this._get_settings().checkbox.override_ui;if(this.data.ui&&this.data.checkbox.noui){this.select_node=this.deselect_node=this.deselect_all=$.noop;this.get_selected=this.get_checked;}
-this.get_container().bind("open_node.jstree create_node.jstree clean_node.jstree refresh.jstree",$.proxy(function(e,data){this._prepare_checkboxes(data.rslt.obj);},this)).bind("loaded.jstree",$.proxy(function(e){this._prepare_checkboxes();},this)).delegate((this.data.ui&&this.data.checkbox.noui?"a":"ins.jstree-checkbox"),"click.jstree",$.proxy(function(e){e.preventDefault();if(this._get_node(e.target).hasClass("jstree-checked")){this.uncheck_node(e.target);}
-else{this.check_node(e.target);}
-if(this.data.ui&&this.data.checkbox.noui){this.save_selected();if(this.data.cookies){this.save_cookie("select_node");}}
-else{e.stopImmediatePropagation();return false;}},this));},defaults:{override_ui:false,two_state:false,real_checkboxes:false,checked_parent_open:true,real_checkboxes_names:function(n){return[("check_"+(n[0].id||Math.ceil(Math.random()*10000))),1];}},__destroy:function(){this.get_container().find("input.jstree-real-checkbox").removeClass("jstree-real-checkbox").end().find("ins.jstree-checkbox").remove();},_fn:{_checkbox_notify:function(n,data){if(data.checked){this.check_node(n,false);}},_prepare_checkboxes:function(obj){obj=!obj||obj==-1?this.get_container().find("> ul > li"):this._get_node(obj);if(obj===false){return;}
-var c,_this=this,t,ts=this._get_settings().checkbox.two_state,rc=this._get_settings().checkbox.real_checkboxes,rcn=this._get_settings().checkbox.real_checkboxes_names;obj.each(function(){t=$(this);c=t.is("li")&&(t.hasClass("jstree-checked")||(rc&&t.children(":checked").length))?"jstree-checked":"jstree-unchecked";t.find("li").andSelf().each(function(){var $t=$(this),nm;$t.children("a"+(_this.data.languages?"":":eq(0)")).not(":has(.jstree-checkbox)").prepend("<ins class='jstree-checkbox'>&#160;</ins>").parent().not(".jstree-checked, .jstree-unchecked").addClass(ts?"jstree-unchecked":c);if(rc){if(!$t.children(":checkbox").length){nm=rcn.call(_this,$t);$t.prepend("<input type='checkbox' class='jstree-real-checkbox' id='"+nm[0]+"' name='"+nm[0]+"' value='"+nm[1]+"' />");}
-else{$t.children(":checkbox").addClass("jstree-real-checkbox");}}
-if(!ts){if(c==="jstree-checked"||$t.hasClass("jstree-checked")||$t.children(':checked').length){$t.find("li").andSelf().addClass("jstree-checked").children(":checkbox").prop("checked",true);}}
-else{if($t.hasClass("jstree-checked")||$t.children(':checked').length){$t.addClass("jstree-checked").children(":checkbox").prop("checked",true);}}});});if(!ts){obj.find(".jstree-checked").parent().parent().each(function(){_this._repair_state(this);});}},change_state:function(obj,state){obj=this._get_node(obj);var coll=false,rc=this._get_settings().checkbox.real_checkboxes;if(!obj||obj===-1){return false;}
-state=(state===false||state===true)?state:obj.hasClass("jstree-checked");if(this._get_settings().checkbox.two_state){if(state){obj.removeClass("jstree-checked").addClass("jstree-unchecked");if(rc){obj.children(":checkbox").prop("checked",false);}}
-else{obj.removeClass("jstree-unchecked").addClass("jstree-checked");if(rc){obj.children(":checkbox").prop("checked",true);}}}
-else{if(state){coll=obj.find("li").andSelf();if(!coll.filter(".jstree-checked, .jstree-undetermined").length){return false;}
-coll.removeClass("jstree-checked jstree-undetermined").addClass("jstree-unchecked");if(rc){coll.children(":checkbox").prop("checked",false);}}
-else{coll=obj.find("li").andSelf();if(!coll.filter(".jstree-unchecked, .jstree-undetermined").length){return false;}
-coll.removeClass("jstree-unchecked jstree-undetermined").addClass("jstree-checked");if(rc){coll.children(":checkbox").prop("checked",true);}
-if(this.data.ui){this.data.ui.last_selected=obj;}
-this.data.checkbox.last_selected=obj;}
-obj.parentsUntil(".jstree","li").each(function(){var $this=$(this);if(state){if($this.children("ul").children("li.jstree-checked, li.jstree-undetermined").length){$this.parentsUntil(".jstree","li").andSelf().removeClass("jstree-checked jstree-unchecked").addClass("jstree-undetermined");if(rc){$this.parentsUntil(".jstree","li").andSelf().children(":checkbox").prop("checked",false);}
-return false;}
-else{$this.removeClass("jstree-checked jstree-undetermined").addClass("jstree-unchecked");if(rc){$this.children(":checkbox").prop("checked",false);}}}
-else{if($this.children("ul").children("li.jstree-unchecked, li.jstree-undetermined").length){$this.parentsUntil(".jstree","li").andSelf().removeClass("jstree-checked jstree-unchecked").addClass("jstree-undetermined");if(rc){$this.parentsUntil(".jstree","li").andSelf().children(":checkbox").prop("checked",false);}
-return false;}
-else{$this.removeClass("jstree-unchecked jstree-undetermined").addClass("jstree-checked");if(rc){$this.children(":checkbox").prop("checked",true);}}}});}
-if(this.data.ui&&this.data.checkbox.noui){this.data.ui.selected=this.get_checked();}
-this.__callback(obj);return true;},check_node:function(obj){if(this.change_state(obj,false)){obj=this._get_node(obj);if(this._get_settings().checkbox.checked_parent_open){var t=this;obj.parents(".jstree-closed").each(function(){t.open_node(this,false,true);});}
-this.__callback({"obj":obj});}},uncheck_node:function(obj){if(this.change_state(obj,true)){this.__callback({"obj":this._get_node(obj)});}},check_all:function(){var _this=this,coll=this._get_settings().checkbox.two_state?this.get_container_ul().find("li"):this.get_container_ul().children("li");coll.each(function(){_this.change_state(this,false);});this.__callback();},uncheck_all:function(){var _this=this,coll=this._get_settings().checkbox.two_state?this.get_container_ul().find("li"):this.get_container_ul().children("li");coll.each(function(){_this.change_state(this,true);});this.__callback();},is_checked:function(obj){obj=this._get_node(obj);return obj.length?obj.is(".jstree-checked"):false;},get_checked:function(obj,get_all){obj=!obj||obj===-1?this.get_container():this._get_node(obj);return get_all||this._get_settings().checkbox.two_state?obj.find(".jstree-checked"):obj.find("> ul > .jstree-checked, .jstree-undetermined > ul > .jstree-checked");},get_unchecked:function(obj,get_all){obj=!obj||obj===-1?this.get_container():this._get_node(obj);return get_all||this._get_settings().checkbox.two_state?obj.find(".jstree-unchecked"):obj.find("> ul > .jstree-unchecked, .jstree-undetermined > ul > .jstree-unchecked");},show_checkboxes:function(){this.get_container().children("ul").removeClass("jstree-no-checkboxes");},hide_checkboxes:function(){this.get_container().children("ul").addClass("jstree-no-checkboxes");},_repair_state:function(obj){obj=this._get_node(obj);if(!obj.length){return;}
-if(this._get_settings().checkbox.two_state){obj.find('li').andSelf().not('.jstree-checked').removeClass('jstree-undetermined').addClass('jstree-unchecked').children(':checkbox').prop('checked',true);return;}
-var rc=this._get_settings().checkbox.real_checkboxes,a=obj.find("> ul > .jstree-checked").length,b=obj.find("> ul > .jstree-undetermined").length,c=obj.find("> ul > li").length;if(c===0){if(obj.hasClass("jstree-undetermined")){this.change_state(obj,false);}}
-else if(a===0&&b===0){this.change_state(obj,true);}
-else if(a===c){this.change_state(obj,false);}
-else{obj.parentsUntil(".jstree","li").andSelf().removeClass("jstree-checked jstree-unchecked").addClass("jstree-undetermined");if(rc){obj.parentsUntil(".jstree","li").andSelf().children(":checkbox").prop("checked",false);}}},reselect:function(){if(this.data.ui&&this.data.checkbox.noui){var _this=this,s=this.data.ui.to_select;s=$.map($.makeArray(s),function(n){return"#"+n.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:");});this.deselect_all();$.each(s,function(i,val){_this.check_node(val);});this.__callback();}
-else{this.__call_old();}},save_loaded:function(){var _this=this;this.data.core.to_load=[];this.get_container_ul().find("li.jstree-closed.jstree-undetermined").each(function(){if(this.id){_this.data.core.to_load.push("#"+this.id);}});}}});$(function(){var css_string='.jstree .jstree-real-checkbox { display:none; } ';$.vakata.css.add_sheet({str:css_string,title:"jstree"});});})(jQuery);(function($){$.vakata.xslt=function(xml,xsl,callback){var rs="",xm,xs,processor,support;if(document.recalc){xm=document.createElement('xml');xs=document.createElement('xml');xm.innerHTML=xml;xs.innerHTML=xsl;$("body").append(xm).append(xs);setTimeout((function(xm,xs,callback){return function(){callback.call(null,xm.transformNode(xs.XMLDocument));setTimeout((function(xm,xs){return function(){$(xm).remove();$(xs).remove();};})(xm,xs),200);};})(xm,xs,callback),100);return true;}
-if(typeof window.DOMParser!=="undefined"&&typeof window.XMLHttpRequest!=="undefined"&&typeof window.XSLTProcessor==="undefined"){xml=new DOMParser().parseFromString(xml,"text/xml");xsl=new DOMParser().parseFromString(xsl,"text/xml");}
-if(typeof window.DOMParser!=="undefined"&&typeof window.XMLHttpRequest!=="undefined"&&typeof window.XSLTProcessor!=="undefined"){processor=new XSLTProcessor();support=$.isFunction(processor.transformDocument)?(typeof window.XMLSerializer!=="undefined"):true;if(!support){return false;}
-xml=new DOMParser().parseFromString(xml,"text/xml");xsl=new DOMParser().parseFromString(xsl,"text/xml");if($.isFunction(processor.transformDocument)){rs=document.implementation.createDocument("","",null);processor.transformDocument(xml,xsl,rs,null);callback.call(null,new XMLSerializer().serializeToString(rs));return true;}
-else{processor.importStylesheet(xsl);rs=processor.transformToFragment(xml,document);callback.call(null,$("<div />").append(rs).html());return true;}}
-return false;};var xsl={'nest':'<'+'?xml version="1.0" encoding="utf-8" ?>'+'<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >'+'<xsl:output method="html" encoding="utf-8" omit-xml-declaration="yes" standalone="no" indent="no" media-type="text/html" />'+'<xsl:template match="/">'+'	<xsl:call-template name="nodes">'+'		<xsl:with-param name="node" select="/root" />'+'	</xsl:call-template>'+'</xsl:template>'+'<xsl:template name="nodes">'+'	<xsl:param name="node" />'+'	<ul>'+'	<xsl:for-each select="$node/item">'+'		<xsl:variable name="children" select="count(./item) &gt; 0" />'+'		<li>'+'			<xsl:attribute name="class">'+'				<xsl:if test="position() = last()">jstree-last </xsl:if>'+'				<xsl:choose>'+'					<xsl:when test="@state = \'open\'">jstree-open </xsl:when>'+'					<xsl:when test="$children or @hasChildren or @state = \'closed\'">jstree-closed </xsl:when>'+'					<xsl:otherwise>jstree-leaf </xsl:otherwise>'+'				</xsl:choose>'+'				<xsl:value-of select="@class" />'+'			</xsl:attribute>'+'			<xsl:for-each select="@*">'+'				<xsl:if test="name() != \'class\' and name() != \'state\' and name() != \'hasChildren\'">'+'					<xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>'+'				</xsl:if>'+'			</xsl:for-each>'+'	<ins class="jstree-icon"><xsl:text>&#xa0;</xsl:text></ins>'+'			<xsl:for-each select="content/name">'+'				<a>'+'				<xsl:attribute name="href">'+'					<xsl:choose>'+'					<xsl:when test="@href"><xsl:value-of select="@href" /></xsl:when>'+'					<xsl:otherwise>#</xsl:otherwise>'+'					</xsl:choose>'+'				</xsl:attribute>'+'				<xsl:attribute name="class"><xsl:value-of select="@lang" /> <xsl:value-of select="@class" /></xsl:attribute>'+'				<xsl:attribute name="style"><xsl:value-of select="@style" /></xsl:attribute>'+'				<xsl:for-each select="@*">'+'					<xsl:if test="name() != \'style\' and name() != \'class\' and name() != \'href\'">'+'						<xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>'+'					</xsl:if>'+'				</xsl:for-each>'+'					<ins>'+'						<xsl:attribute name="class">jstree-icon '+'							<xsl:if test="string-length(attribute::icon) > 0 and not(contains(@icon,\'/\'))"><xsl:value-of select="@icon" /></xsl:if>'+'						</xsl:attribute>'+'						<xsl:if test="string-length(attribute::icon) > 0 and contains(@icon,\'/\')"><xsl:attribute name="style">background:url(<xsl:value-of select="@icon" />) center center no-repeat;</xsl:attribute></xsl:if>'+'						<xsl:text>&#xa0;</xsl:text>'+'					</ins>'+'					<xsl:copy-of select="./child::node()" />'+'				</a>'+'			</xsl:for-each>'+'			<xsl:if test="$children or @hasChildren"><xsl:call-template name="nodes"><xsl:with-param name="node" select="current()" /></xsl:call-template></xsl:if>'+'		</li>'+'	</xsl:for-each>'+'	</ul>'+'</xsl:template>'+'</xsl:stylesheet>','flat':'<'+'?xml version="1.0" encoding="utf-8" ?>'+'<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >'+'<xsl:output method="html" encoding="utf-8" omit-xml-declaration="yes" standalone="no" indent="no" media-type="text/xml" />'+'<xsl:template match="/">'+'	<ul>'+'	<xsl:for-each select="//item[not(@parent_id) or @parent_id=0 or not(@parent_id = //item/@id)]">'+'		<xsl:call-template name="nodes">'+'			<xsl:with-param name="node" select="." />'+'			<xsl:with-param name="is_last" select="number(position() = last())" />'+'		</xsl:call-template>'+'	</xsl:for-each>'+'	</ul>'+'</xsl:template>'+'<xsl:template name="nodes">'+'	<xsl:param name="node" />'+'	<xsl:param name="is_last" />'+'	<xsl:variable name="children" select="count(//item[@parent_id=$node/attribute::id]) &gt; 0" />'+'	<li>'+'	<xsl:attribute name="class">'+'		<xsl:if test="$is_last = true()">jstree-last </xsl:if>'+'		<xsl:choose>'+'			<xsl:when test="@state = \'open\'">jstree-open </xsl:when>'+'			<xsl:when test="$children or @hasChildren or @state = \'closed\'">jstree-closed </xsl:when>'+'			<xsl:otherwise>jstree-leaf </xsl:otherwise>'+'		</xsl:choose>'+'		<xsl:value-of select="@class" />'+'	</xsl:attribute>'+'	<xsl:for-each select="@*">'+'		<xsl:if test="name() != \'parent_id\' and name() != \'hasChildren\' and name() != \'class\' and name() != \'state\'">'+'		<xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>'+'		</xsl:if>'+'	</xsl:for-each>'+'	<ins class="jstree-icon"><xsl:text>&#xa0;</xsl:text></ins>'+'	<xsl:for-each select="content/name">'+'		<a>'+'		<xsl:attribute name="href">'+'			<xsl:choose>'+'			<xsl:when test="@href"><xsl:value-of select="@href" /></xsl:when>'+'			<xsl:otherwise>#</xsl:otherwise>'+'			</xsl:choose>'+'		</xsl:attribute>'+'		<xsl:attribute name="class"><xsl:value-of select="@lang" /> <xsl:value-of select="@class" /></xsl:attribute>'+'		<xsl:attribute name="style"><xsl:value-of select="@style" /></xsl:attribute>'+'		<xsl:for-each select="@*">'+'			<xsl:if test="name() != \'style\' and name() != \'class\' and name() != \'href\'">'+'				<xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>'+'			</xsl:if>'+'		</xsl:for-each>'+'			<ins>'+'				<xsl:attribute name="class">jstree-icon '+'					<xsl:if test="string-length(attribute::icon) > 0 and not(contains(@icon,\'/\'))"><xsl:value-of select="@icon" /></xsl:if>'+'				</xsl:attribute>'+'				<xsl:if test="string-length(attribute::icon) > 0 and contains(@icon,\'/\')"><xsl:attribute name="style">background:url(<xsl:value-of select="@icon" />) center center no-repeat;</xsl:attribute></xsl:if>'+'				<xsl:text>&#xa0;</xsl:text>'+'			</ins>'+'			<xsl:copy-of select="./child::node()" />'+'		</a>'+'	</xsl:for-each>'+'	<xsl:if test="$children">'+'		<ul>'+'		<xsl:for-each select="//item[@parent_id=$node/attribute::id]">'+'			<xsl:call-template name="nodes">'+'				<xsl:with-param name="node" select="." />'+'				<xsl:with-param name="is_last" select="number(position() = last())" />'+'			</xsl:call-template>'+'		</xsl:for-each>'+'		</ul>'+'	</xsl:if>'+'	</li>'+'</xsl:template>'+'</xsl:stylesheet>'},escape_xml=function(string){return string.toString().replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;').replace(/'/g,'&apos;');};$.jstree.plugin("xml_data",{defaults:{data:false,ajax:false,xsl:"flat",clean_node:false,correct_state:true,get_skip_empty:false,get_include_preamble:true},_fn:{load_node:function(obj,s_call,e_call){var _this=this;this.load_node_xml(obj,function(){_this.__callback({"obj":_this._get_node(obj)});s_call.call(this);},e_call);},_is_loaded:function(obj){var s=this._get_settings().xml_data;obj=this._get_node(obj);return obj==-1||!obj||(!s.ajax&&!$.isFunction(s.data))||obj.is(".jstree-open, .jstree-leaf")||obj.children("ul").children("li").size()>0;},load_node_xml:function(obj,s_call,e_call){var s=this.get_settings().xml_data,error_func=function(){},success_func=function(){};obj=this._get_node(obj);if(obj&&obj!==-1){if(obj.data("jstree_is_loading")){return;}
-else{obj.data("jstree_is_loading",true);}}
-switch(!0){case(!s.data&&!s.ajax):throw"Neither data nor ajax settings supplied.";case($.isFunction(s.data)):s.data.call(this,obj,$.proxy(function(d){this.parse_xml(d,$.proxy(function(d){if(d){d=d.replace(/ ?xmlns="[^"]*"/ig,"");if(d.length>10){d=$(d);if(obj===-1||!obj){this.get_container().children("ul").empty().append(d.children());}
-else{obj.children("a.jstree-loading").removeClass("jstree-loading");obj.append(d);obj.removeData("jstree_is_loading");}
-if(s.clean_node){this.clean_node(obj);}
-if(s_call){s_call.call(this);}}
-else{if(obj&&obj!==-1){obj.children("a.jstree-loading").removeClass("jstree-loading");obj.removeData("jstree_is_loading");if(s.correct_state){this.correct_state(obj);if(s_call){s_call.call(this);}}}
-else{if(s.correct_state){this.get_container().children("ul").empty();if(s_call){s_call.call(this);}}}}}},this));},this));break;case(!!s.data&&!s.ajax)||(!!s.data&&!!s.ajax&&(!obj||obj===-1)):if(!obj||obj==-1){this.parse_xml(s.data,$.proxy(function(d){if(d){d=d.replace(/ ?xmlns="[^"]*"/ig,"");if(d.length>10){d=$(d);this.get_container().children("ul").empty().append(d.children());if(s.clean_node){this.clean_node(obj);}
-if(s_call){s_call.call(this);}}}
-else{if(s.correct_state){this.get_container().children("ul").empty();if(s_call){s_call.call(this);}}}},this));}
-break;case(!s.data&&!!s.ajax)||(!!s.data&&!!s.ajax&&obj&&obj!==-1):error_func=function(x,t,e){var ef=this.get_settings().xml_data.ajax.error;if(ef){ef.call(this,x,t,e);}
-if(obj!==-1&&obj.length){obj.children("a.jstree-loading").removeClass("jstree-loading");obj.removeData("jstree_is_loading");if(t==="success"&&s.correct_state){this.correct_state(obj);}}
-else{if(t==="success"&&s.correct_state){this.get_container().children("ul").empty();}}
-if(e_call){e_call.call(this);}};success_func=function(d,t,x){d=x.responseText;var sf=this.get_settings().xml_data.ajax.success;if(sf){d=sf.call(this,d,t,x)||d;}
-if(d===""||(d&&d.toString&&d.toString().replace(/^[\s\n]+$/,"")==="")){return error_func.call(this,x,t,"");}
-this.parse_xml(d,$.proxy(function(d){if(d){d=d.replace(/ ?xmlns="[^"]*"/ig,"");if(d.length>10){d=$(d);if(obj===-1||!obj){this.get_container().children("ul").empty().append(d.children());}
-else{obj.children("a.jstree-loading").removeClass("jstree-loading");obj.append(d);obj.removeData("jstree_is_loading");}
-if(s.clean_node){this.clean_node(obj);}
-if(s_call){s_call.call(this);}}
-else{if(obj&&obj!==-1){obj.children("a.jstree-loading").removeClass("jstree-loading");obj.removeData("jstree_is_loading");if(s.correct_state){this.correct_state(obj);if(s_call){s_call.call(this);}}}
-else{if(s.correct_state){this.get_container().children("ul").empty();if(s_call){s_call.call(this);}}}}}},this));};s.ajax.context=this;s.ajax.error=error_func;s.ajax.success=success_func;if(!s.ajax.dataType){s.ajax.dataType="xml";}
-if($.isFunction(s.ajax.url)){s.ajax.url=s.ajax.url.call(this,obj);}
-if($.isFunction(s.ajax.data)){s.ajax.data=s.ajax.data.call(this,obj);}
-$.ajax(s.ajax);break;}},parse_xml:function(xml,callback){var s=this._get_settings().xml_data;$.vakata.xslt(xml,xsl[s.xsl],callback);},get_xml:function(tp,obj,li_attr,a_attr,is_callback){var result="",s=this._get_settings(),_this=this,tmp1,tmp2,li,a,lang;if(!tp){tp="flat";}
-if(!is_callback){is_callback=0;}
-obj=this._get_node(obj);if(!obj||obj===-1){obj=this.get_container().find("> ul > li");}
-li_attr=$.isArray(li_attr)?li_attr:["id","class"];if(!is_callback&&this.data.types&&$.inArray(s.types.type_attr,li_attr)===-1){li_attr.push(s.types.type_attr);}
-a_attr=$.isArray(a_attr)?a_attr:[];if(!is_callback){if(s.xml_data.get_include_preamble){result+='<'+'?xml version="1.0" encoding="UTF-8"?'+'>';}
-result+="<root>";}
-obj.each(function(){result+="<item";li=$(this);$.each(li_attr,function(i,v){var t=li.attr(v);if(!s.xml_data.get_skip_empty||typeof t!=="undefined"){result+=" "+v+"=\""+escape_xml((" "+(t||"")).replace(/ jstree[^ ]*/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,""))+"\"";}});if(li.hasClass("jstree-open")){result+=" state=\"open\"";}
-if(li.hasClass("jstree-closed")){result+=" state=\"closed\"";}
-if(tp==="flat"){result+=" parent_id=\""+escape_xml(is_callback)+"\"";}
-result+=">";result+="<content>";a=li.children("a");a.each(function(){tmp1=$(this);lang=false;result+="<name";if($.inArray("languages",s.plugins)!==-1){$.each(s.languages,function(k,z){if(tmp1.hasClass(z)){result+=" lang=\""+escape_xml(z)+"\"";lang=z;return false;}});}
-if(a_attr.length){$.each(a_attr,function(k,z){var t=tmp1.attr(z);if(!s.xml_data.get_skip_empty||typeof t!=="undefined"){result+=" "+z+"=\""+escape_xml((" "+t||"").replace(/ jstree[^ ]*/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,""))+"\"";}});}
-if(tmp1.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,'').replace(/^\s+$/ig,"").length){result+=' icon="'+escape_xml(tmp1.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,""))+'"';}
-if(tmp1.children("ins").get(0).style.backgroundImage.length){result+=' icon="'+escape_xml(tmp1.children("ins").get(0).style.backgroundImage.replace("url(","").replace(")","").replace(/'/ig,"").replace(/"/ig,""))+'"';}
-result+=">";result+="<![CDATA["+_this.get_text(tmp1,lang)+"]]>";result+="</name>";});result+="</content>";tmp2=li[0].id||true;li=li.find("> ul > li");if(li.length){tmp2=_this.get_xml(tp,li,li_attr,a_attr,tmp2);}
-else{tmp2="";}
-if(tp=="nest"){result+=tmp2;}
-result+="</item>";if(tp=="flat"){result+=tmp2;}});if(!is_callback){result+="</root>";}
-return result;}}});})(jQuery);(function($){$.expr[':'].jstree_contains=function(a,i,m){return(a.textContent||a.innerText||"").toLowerCase().indexOf(m[3].toLowerCase())>=0;};$.expr[':'].jstree_title_contains=function(a,i,m){return(a.getAttribute("title")||"").toLowerCase().indexOf(m[3].toLowerCase())>=0;};$.jstree.plugin("search",{__init:function(){this.data.search.str="";this.data.search.result=$();if(this._get_settings().search.show_only_matches){this.get_container().bind("search.jstree",function(e,data){$(this).children("ul").find("li").hide().removeClass("jstree-last");data.rslt.nodes.parentsUntil(".jstree").andSelf().show().filter("ul").each(function(){$(this).children("li:visible").eq(-1).addClass("jstree-last");});}).bind("clear_search.jstree",function(){$(this).children("ul").find("li").css("display","").end().end().jstree("clean_node",-1);});}},defaults:{ajax:false,search_method:"jstree_contains",show_only_matches:false},_fn:{search:function(str,skip_async){if($.trim(str)===""){this.clear_search();return;}
-var s=this.get_settings().search,t=this,error_func=function(){},success_func=function(){};this.data.search.str=str;if(!skip_async&&s.ajax!==false&&this.get_container_ul().find("li.jstree-closed:not(:has(ul)):eq(0)").length>0){this.search.supress_callback=true;error_func=function(){};success_func=function(d,t,x){var sf=this.get_settings().search.ajax.success;if(sf){d=sf.call(this,d,t,x)||d;}
-this.data.search.to_open=d;this._search_open();};s.ajax.context=this;s.ajax.error=error_func;s.ajax.success=success_func;if($.isFunction(s.ajax.url)){s.ajax.url=s.ajax.url.call(this,str);}
-if($.isFunction(s.ajax.data)){s.ajax.data=s.ajax.data.call(this,str);}
-if(!s.ajax.data){s.ajax.data={"search_string":str};}
-if(!s.ajax.dataType||/^json/.exec(s.ajax.dataType)){s.ajax.dataType="json";}
-$.ajax(s.ajax);return;}
-if(this.data.search.result.length){this.clear_search();}
-this.data.search.result=this.get_container().find("a"+(this.data.languages?"."+this.get_lang():"")+":"+(s.search_method)+"("+this.data.search.str+")");this.data.search.result.addClass("jstree-search").parent().parents(".jstree-closed").each(function(){t.open_node(this,false,true);});this.__callback({nodes:this.data.search.result,str:str});},clear_search:function(str){this.data.search.result.removeClass("jstree-search");this.__callback(this.data.search.result);this.data.search.result=$();},_search_open:function(is_callback){var _this=this,done=true,current=[],remaining=[];if(this.data.search.to_open.length){$.each(this.data.search.to_open,function(i,val){if(val=="#"){return true;}
-if($(val).length&&$(val).is(".jstree-closed")){current.push(val);}
-else{remaining.push(val);}});if(current.length){this.data.search.to_open=remaining;$.each(current,function(i,val){_this.open_node(val,function(){_this._search_open(true);});});done=false;}}
-if(done){this.search(this.data.search.str,true);}}}});})(jQuery);(function($){$.vakata.context={hide_on_mouseleave:false,cnt:$("<div id='vakata-contextmenu' />"),vis:false,tgt:false,par:false,func:false,data:false,rtl:false,show:function(s,t,x,y,d,p,rtl){$.vakata.context.rtl=!!rtl;var html=$.vakata.context.parse(s),h,w;if(!html){return;}
-$.vakata.context.vis=true;$.vakata.context.tgt=t;$.vakata.context.par=p||t||null;$.vakata.context.data=d||null;$.vakata.context.cnt.html(html).css({"visibility":"hidden","display":"block","left":0,"top":0});if($.vakata.context.hide_on_mouseleave){$.vakata.context.cnt.one("mouseleave",function(e){$.vakata.context.hide();});}
-h=$.vakata.context.cnt.height();w=$.vakata.context.cnt.width();if(x+w>$(document).width()){x=$(document).width()-(w+5);$.vakata.context.cnt.find("li > ul").addClass("right");}
-if(y+h>$(document).height()){y=y-(h+t[0].offsetHeight);$.vakata.context.cnt.find("li > ul").addClass("bottom");}
-$.vakata.context.cnt.css({"left":x,"top":y}).find("li:has(ul)").bind("mouseenter",function(e){var w=$(document).width(),h=$(document).height(),ul=$(this).children("ul").show();if(w!==$(document).width()){ul.toggleClass("right");}
-if(h!==$(document).height()){ul.toggleClass("bottom");}}).bind("mouseleave",function(e){$(this).children("ul").hide();}).end().css({"visibility":"visible"}).show();$(document).triggerHandler("context_show.vakata");},hide:function(){$.vakata.context.vis=false;$.vakata.context.cnt.attr("class","").css({"visibility":"hidden"});$(document).triggerHandler("context_hide.vakata");},parse:function(s,is_callback){if(!s){return false;}
-var str="",tmp=false,was_sep=true;if(!is_callback){$.vakata.context.func={};}
-str+="<ul>";$.each(s,function(i,val){if(!val){return true;}
-$.vakata.context.func[i]=val.action;if(!was_sep&&val.separator_before){str+="<li class='vakata-separator vakata-separator-before'></li>";}
-was_sep=false;str+="<li class='"+(val._class||"")+(val._disabled?" jstree-contextmenu-disabled ":"")+"'><ins ";if(val.icon&&val.icon.indexOf("/")===-1){str+=" class='"+val.icon+"' ";}
-if(val.icon&&val.icon.indexOf("/")!==-1){str+=" style='background:url("+val.icon+") center center no-repeat;' ";}
-str+=">&#160;</ins><a href='#' rel='"+i+"'>";if(val.submenu){str+="<span style='float:"+($.vakata.context.rtl?"left":"right")+";'>&raquo;</span>";}
-str+=val.label+"</a>";if(val.submenu){tmp=$.vakata.context.parse(val.submenu,true);if(tmp){str+=tmp;}}
-str+="</li>";if(val.separator_after){str+="<li class='vakata-separator vakata-separator-after'></li>";was_sep=true;}});str=str.replace(/<li class\='vakata-separator vakata-separator-after'\><\/li\>$/,"");str+="</ul>";$(document).triggerHandler("context_parse.vakata");return str.length>10?str:false;},exec:function(i){if($.isFunction($.vakata.context.func[i])){$.vakata.context.func[i].call($.vakata.context.data,$.vakata.context.par);return true;}
-else{return false;}}};$(function(){var css_string=''+'#vakata-contextmenu { display:block; visibility:hidden; left:0; top:-200px; position:absolute; margin:0; padding:0; min-width:180px; background:#ebebeb; border:1px solid silver; z-index:10000; *width:180px; } '+'#vakata-contextmenu ul { min-width:180px; *width:180px; } '+'#vakata-contextmenu ul, #vakata-contextmenu li { margin:0; padding:0; list-style-type:none; display:block; } '+'#vakata-contextmenu li { line-height:20px; min-height:20px; position:relative; padding:0px; } '+'#vakata-contextmenu li a { padding:1px 6px; line-height:17px; display:block; text-decoration:none; margin:1px 1px 0 1px; } '+'#vakata-contextmenu li ins { float:left; width:16px; height:16px; text-decoration:none; margin-right:2px; } '+'#vakata-contextmenu li a:hover, #vakata-contextmenu li.vakata-hover > a { background:gray; color:white; } '+'#vakata-contextmenu li ul { display:none; position:absolute; top:-2px; left:100%; background:#ebebeb; border:1px solid gray; } '+'#vakata-contextmenu .right { right:100%; left:auto; } '+'#vakata-contextmenu .bottom { bottom:-1px; top:auto; } '+'#vakata-contextmenu li.vakata-separator { min-height:0; height:1px; line-height:1px; font-size:1px; overflow:hidden; margin:0 2px; background:silver; /* border-top:1px solid #fefefe; */ padding:0; } ';$.vakata.css.add_sheet({str:css_string,title:"vakata"});$.vakata.context.cnt.delegate("a","click",function(e){e.preventDefault();}).delegate("a","mouseup",function(e){if(!$(this).parent().hasClass("jstree-contextmenu-disabled")&&$.vakata.context.exec($(this).attr("rel"))){$.vakata.context.hide();}
-else{$(this).blur();}}).delegate("a","mouseover",function(){$.vakata.context.cnt.find(".vakata-hover").removeClass("vakata-hover");}).appendTo("body");$(document).bind("mousedown",function(e){if($.vakata.context.vis&&!$.contains($.vakata.context.cnt[0],e.target)){$.vakata.context.hide();}});if(typeof $.hotkeys!=="undefined"){$(document).bind("keydown","up",function(e){if($.vakata.context.vis){var o=$.vakata.context.cnt.find("ul:visible").last().children(".vakata-hover").removeClass("vakata-hover").prevAll("li:not(.vakata-separator)").first();if(!o.length){o=$.vakata.context.cnt.find("ul:visible").last().children("li:not(.vakata-separator)").last();}
-o.addClass("vakata-hover");e.stopImmediatePropagation();e.preventDefault();}}).bind("keydown","down",function(e){if($.vakata.context.vis){var o=$.vakata.context.cnt.find("ul:visible").last().children(".vakata-hover").removeClass("vakata-hover").nextAll("li:not(.vakata-separator)").first();if(!o.length){o=$.vakata.context.cnt.find("ul:visible").last().children("li:not(.vakata-separator)").first();}
-o.addClass("vakata-hover");e.stopImmediatePropagation();e.preventDefault();}}).bind("keydown","right",function(e){if($.vakata.context.vis){$.vakata.context.cnt.find(".vakata-hover").children("ul").show().children("li:not(.vakata-separator)").removeClass("vakata-hover").first().addClass("vakata-hover");e.stopImmediatePropagation();e.preventDefault();}}).bind("keydown","left",function(e){if($.vakata.context.vis){$.vakata.context.cnt.find(".vakata-hover").children("ul").hide().children(".vakata-separator").removeClass("vakata-hover");e.stopImmediatePropagation();e.preventDefault();}}).bind("keydown","esc",function(e){$.vakata.context.hide();e.preventDefault();}).bind("keydown","space",function(e){$.vakata.context.cnt.find(".vakata-hover").last().children("a").click();e.preventDefault();});}});$.jstree.plugin("contextmenu",{__init:function(){this.get_container().delegate("a","contextmenu.jstree",$.proxy(function(e){e.preventDefault();if(!$(e.currentTarget).hasClass("jstree-loading")){this.show_contextmenu(e.currentTarget,e.pageX,e.pageY);}},this)).delegate("a","click.jstree",$.proxy(function(e){if(this.data.contextmenu){$.vakata.context.hide();}},this)).bind("destroy.jstree",$.proxy(function(){if(this.data.contextmenu){$.vakata.context.hide();}},this));$(document).bind("context_hide.vakata",$.proxy(function(){this.data.contextmenu=false;},this));},defaults:{select_node:false,show_at_node:true,items:{"create":{"separator_before":false,"separator_after":true,"label":"Create","action":function(obj){this.create(obj);}},"rename":{"separator_before":false,"separator_after":false,"label":"Rename","action":function(obj){this.rename(obj);}},"remove":{"separator_before":false,"icon":false,"separator_after":false,"label":"Delete","action":function(obj){if(this.is_selected(obj)){this.remove();}else{this.remove(obj);}}},"ccp":{"separator_before":true,"icon":false,"separator_after":false,"label":"Edit","action":false,"submenu":{"cut":{"separator_before":false,"separator_after":false,"label":"Cut","action":function(obj){this.cut(obj);}},"copy":{"separator_before":false,"icon":false,"separator_after":false,"label":"Copy","action":function(obj){this.copy(obj);}},"paste":{"separator_before":false,"icon":false,"separator_after":false,"label":"Paste","action":function(obj){this.paste(obj);}}}}}},_fn:{show_contextmenu:function(obj,x,y){obj=this._get_node(obj);var s=this.get_settings().contextmenu,a=obj.children("a:visible:eq(0)"),o=false,i=false;if(s.select_node&&this.data.ui&&!this.is_selected(obj)){this.deselect_all();this.select_node(obj,true);}
-if(s.show_at_node||typeof x==="undefined"||typeof y==="undefined"){o=a.offset();x=o.left;y=o.top+this.data.core.li_height;}
-i=obj.data("jstree")&&obj.data("jstree").contextmenu?obj.data("jstree").contextmenu:s.items;if($.isFunction(i)){i=i.call(this,obj);}
-this.data.contextmenu=true;$.vakata.context.show(i,a,x,y,this,obj,this._get_settings().core.rtl);if(this.data.themes){$.vakata.context.cnt.attr("class","jstree-"+this.data.themes.theme+"-context");}}}});})(jQuery);(function($){$.jstree.plugin("types",{__init:function(){var s=this._get_settings().types;this.data.types.attach_to=[];this.get_container().bind("init.jstree",$.proxy(function(){var types=s.types,attr=s.type_attr,icons_css="",_this=this;$.each(types,function(i,tp){$.each(tp,function(k,v){if(!/^(max_depth|max_children|icon|valid_children)$/.test(k)){_this.data.types.attach_to.push(k);}});if(!tp.icon){return true;}
-if(tp.icon.image||tp.icon.position){if(i=="default"){icons_css+='.jstree-'+_this.get_index()+' a > .jstree-icon { ';}
-else{icons_css+='.jstree-'+_this.get_index()+' li['+attr+'="'+i+'"] > a > .jstree-icon { ';}
-if(tp.icon.image){icons_css+=' background-image:url('+tp.icon.image+'); ';}
-if(tp.icon.position){icons_css+=' background-position:'+tp.icon.position+'; ';}
-else{icons_css+=' background-position:0 0; ';}
-icons_css+='} ';}});if(icons_css!==""){$.vakata.css.add_sheet({'str':icons_css,title:"jstree-types"});}},this)).bind("before.jstree",$.proxy(function(e,data){var s,t,o=this._get_settings().types.use_data?this._get_node(data.args[0]):false,d=o&&o!==-1&&o.length?o.data("jstree"):false;if(d&&d.types&&d.types[data.func]===false){e.stopImmediatePropagation();return false;}
-if($.inArray(data.func,this.data.types.attach_to)!==-1){if(!data.args[0]||(!data.args[0].tagName&&!data.args[0].jquery)){return;}
-s=this._get_settings().types.types;t=this._get_type(data.args[0]);if(((s[t]&&typeof s[t][data.func]!=="undefined")||(s["default"]&&typeof s["default"][data.func]!=="undefined"))&&this._check(data.func,data.args[0])===false){e.stopImmediatePropagation();return false;}}},this));if(is_ie6){this.get_container().bind("load_node.jstree set_type.jstree",$.proxy(function(e,data){var r=data&&data.rslt&&data.rslt.obj&&data.rslt.obj!==-1?this._get_node(data.rslt.obj).parent():this.get_container_ul(),c=false,s=this._get_settings().types;$.each(s.types,function(i,tp){if(tp.icon&&(tp.icon.image||tp.icon.position)){c=i==="default"?r.find("li > a > .jstree-icon"):r.find("li["+s.type_attr+"='"+i+"'] > a > .jstree-icon");if(tp.icon.image){c.css("backgroundImage","url("+tp.icon.image+")");}
-c.css("backgroundPosition",tp.icon.position||"0 0");}});},this));}},defaults:{max_children:-1,max_depth:-1,valid_children:"all",use_data:false,type_attr:"rel",types:{"default":{"max_children":-1,"max_depth":-1,"valid_children":"all"}}},_fn:{_types_notify:function(n,data){if(data.type&&this._get_settings().types.use_data){this.set_type(data.type,n);}},_get_type:function(obj){obj=this._get_node(obj);return(!obj||!obj.length)?false:obj.attr(this._get_settings().types.type_attr)||"default";},set_type:function(str,obj){obj=this._get_node(obj);var ret=(!obj.length||!str)?false:obj.attr(this._get_settings().types.type_attr,str);if(ret){this.__callback({obj:obj,type:str});}
-return ret;},_check:function(rule,obj,opts){obj=this._get_node(obj);var v=false,t=this._get_type(obj),d=0,_this=this,s=this._get_settings().types,data=false;if(obj===-1){if(!!s[rule]){v=s[rule];}
-else{return;}}
-else{if(t===false){return;}
-data=s.use_data?obj.data("jstree"):false;if(data&&data.types&&typeof data.types[rule]!=="undefined"){v=data.types[rule];}
-else if(!!s.types[t]&&typeof s.types[t][rule]!=="undefined"){v=s.types[t][rule];}
-else if(!!s.types["default"]&&typeof s.types["default"][rule]!=="undefined"){v=s.types["default"][rule];}}
-if($.isFunction(v)){v=v.call(this,obj);}
-if(rule==="max_depth"&&obj!==-1&&opts!==false&&s.max_depth!==-2&&v!==0){obj.children("a:eq(0)").parentsUntil(".jstree","li").each(function(i){if(s.max_depth!==-1&&s.max_depth-(i+1)<=0){v=0;return false;}
-d=(i===0)?v:_this._check(rule,this,false);if(d!==-1&&d-(i+1)<=0){v=0;return false;}
-if(d>=0&&(d-(i+1)<v||v<0)){v=d-(i+1);}
-if(s.max_depth>=0&&(s.max_depth-(i+1)<v||v<0)){v=s.max_depth-(i+1);}});}
-return v;},check_move:function(){if(!this.__call_old()){return false;}
-var m=this._get_move(),s=m.rt._get_settings().types,mc=m.rt._check("max_children",m.cr),md=m.rt._check("max_depth",m.cr),vc=m.rt._check("valid_children",m.cr),ch=0,d=1,t;if(vc==="none"){return false;}
-if($.isArray(vc)&&m.ot&&m.ot._get_type){m.o.each(function(){if($.inArray(m.ot._get_type(this),vc)===-1){d=false;return false;}});if(d===false){return false;}}
-if(s.max_children!==-2&&mc!==-1){ch=m.cr===-1?this.get_container().find("> ul > li").not(m.o).length:m.cr.find("> ul > li").not(m.o).length;if(ch+m.o.length>mc){return false;}}
-if(s.max_depth!==-2&&md!==-1){d=0;if(md===0){return false;}
-if(typeof m.o.d==="undefined"){t=m.o;while(t.length>0){t=t.find("> ul > li");d++;}
-m.o.d=d;}
-if(md-m.o.d<0){return false;}}
-return true;},create_node:function(obj,position,js,callback,is_loaded,skip_check){if(!skip_check&&(is_loaded||this._is_loaded(obj))){var p=(typeof position=="string"&&position.match(/^before|after$/i)&&obj!==-1)?this._get_parent(obj):this._get_node(obj),s=this._get_settings().types,mc=this._check("max_children",p),md=this._check("max_depth",p),vc=this._check("valid_children",p),ch;if(typeof js==="string"){js={data:js};}
-if(!js){js={};}
-if(vc==="none"){return false;}
-if($.isArray(vc)){if(!js.attr||!js.attr[s.type_attr]){if(!js.attr){js.attr={};}
-js.attr[s.type_attr]=vc[0];}
-else{if($.inArray(js.attr[s.type_attr],vc)===-1){return false;}}}
-if(s.max_children!==-2&&mc!==-1){ch=p===-1?this.get_container().find("> ul > li").length:p.find("> ul > li").length;if(ch+1>mc){return false;}}
-if(s.max_depth!==-2&&md!==-1&&(md-1)<0){return false;}}
-return this.__call_old(true,obj,position,js,callback,is_loaded,skip_check);}}});})(jQuery);(function($){$.jstree.plugin("html_data",{__init:function(){this.data.html_data.original_container_html=this.get_container().find(" > ul > li").clone(true);this.data.html_data.original_container_html.find("li").andSelf().contents().filter(function(){return this.nodeType==3;}).remove();},defaults:{data:false,ajax:false,correct_state:true},_fn:{load_node:function(obj,s_call,e_call){var _this=this;this.load_node_html(obj,function(){_this.__callback({"obj":_this._get_node(obj)});s_call.call(this);},e_call);},_is_loaded:function(obj){obj=this._get_node(obj);return obj==-1||!obj||(!this._get_settings().html_data.ajax&&!$.isFunction(this._get_settings().html_data.data))||obj.is(".jstree-open, .jstree-leaf")||obj.children("ul").children("li").size()>0;},load_node_html:function(obj,s_call,e_call){var d,s=this.get_settings().html_data,error_func=function(){},success_func=function(){};obj=this._get_node(obj);if(obj&&obj!==-1){if(obj.data("jstree_is_loading")){return;}
-else{obj.data("jstree_is_loading",true);}}
-switch(!0){case($.isFunction(s.data)):s.data.call(this,obj,$.proxy(function(d){if(d&&d!==""&&d.toString&&d.toString().replace(/^[\s\n]+$/,"")!==""){d=$(d);if(!d.is("ul")){d=$("<ul />").append(d);}
-if(obj==-1||!obj){this.get_container().children("ul").empty().append(d.children()).find("li, a").filter(function(){return!this.firstChild||!this.firstChild.tagName||this.firstChild.tagName!=="INS";}).prepend("<ins class='jstree-icon'>&#160;</ins>").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon");}
-else{obj.children("a.jstree-loading").removeClass("jstree-loading");obj.append(d).children("ul").find("li, a").filter(function(){return!this.firstChild||!this.firstChild.tagName||this.firstChild.tagName!=="INS";}).prepend("<ins class='jstree-icon'>&#160;</ins>").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon");obj.removeData("jstree_is_loading");}
-this.clean_node(obj);if(s_call){s_call.call(this);}}
-else{if(obj&&obj!==-1){obj.children("a.jstree-loading").removeClass("jstree-loading");obj.removeData("jstree_is_loading");if(s.correct_state){this.correct_state(obj);if(s_call){s_call.call(this);}}}
-else{if(s.correct_state){this.get_container().children("ul").empty();if(s_call){s_call.call(this);}}}}},this));break;case(!s.data&&!s.ajax):if(!obj||obj==-1){this.get_container().children("ul").empty().append(this.data.html_data.original_container_html).find("li, a").filter(function(){return!this.firstChild||!this.firstChild.tagName||this.firstChild.tagName!=="INS";}).prepend("<ins class='jstree-icon'>&#160;</ins>").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon");this.clean_node();}
-if(s_call){s_call.call(this);}
-break;case(!!s.data&&!s.ajax)||(!!s.data&&!!s.ajax&&(!obj||obj===-1)):if(!obj||obj==-1){d=$(s.data);if(!d.is("ul")){d=$("<ul />").append(d);}
-this.get_container().children("ul").empty().append(d.children()).find("li, a").filter(function(){return!this.firstChild||!this.firstChild.tagName||this.firstChild.tagName!=="INS";}).prepend("<ins class='jstree-icon'>&#160;</ins>").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon");this.clean_node();}
-if(s_call){s_call.call(this);}
-break;case(!s.data&&!!s.ajax)||(!!s.data&&!!s.ajax&&obj&&obj!==-1):obj=this._get_node(obj);error_func=function(x,t,e){var ef=this.get_settings().html_data.ajax.error;if(ef){ef.call(this,x,t,e);}
-if(obj!=-1&&obj.length){obj.children("a.jstree-loading").removeClass("jstree-loading");obj.removeData("jstree_is_loading");if(t==="success"&&s.correct_state){this.correct_state(obj);}}
-else{if(t==="success"&&s.correct_state){this.get_container().children("ul").empty();}}
-if(e_call){e_call.call(this);}};success_func=function(d,t,x){var sf=this.get_settings().html_data.ajax.success;if(sf){d=sf.call(this,d,t,x)||d;}
-if(d===""||(d&&d.toString&&d.toString().replace(/^[\s\n]+$/,"")==="")){return error_func.call(this,x,t,"");}
-if(d){d=$(d);if(!d.is("ul")){d=$("<ul />").append(d);}
-if(obj==-1||!obj){this.get_container().children("ul").empty().append(d.children()).find("li, a").filter(function(){return!this.firstChild||!this.firstChild.tagName||this.firstChild.tagName!=="INS";}).prepend("<ins class='jstree-icon'>&#160;</ins>").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon");}
-else{obj.children("a.jstree-loading").removeClass("jstree-loading");obj.append(d).children("ul").find("li, a").filter(function(){return!this.firstChild||!this.firstChild.tagName||this.firstChild.tagName!=="INS";}).prepend("<ins class='jstree-icon'>&#160;</ins>").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon");obj.removeData("jstree_is_loading");}
-this.clean_node(obj);if(s_call){s_call.call(this);}}
-else{if(obj&&obj!==-1){obj.children("a.jstree-loading").removeClass("jstree-loading");obj.removeData("jstree_is_loading");if(s.correct_state){this.correct_state(obj);if(s_call){s_call.call(this);}}}
-else{if(s.correct_state){this.get_container().children("ul").empty();if(s_call){s_call.call(this);}}}}};s.ajax.context=this;s.ajax.error=error_func;s.ajax.success=success_func;if(!s.ajax.dataType){s.ajax.dataType="html";}
-if($.isFunction(s.ajax.url)){s.ajax.url=s.ajax.url.call(this,obj);}
-if($.isFunction(s.ajax.data)){s.ajax.data=s.ajax.data.call(this,obj);}
-$.ajax(s.ajax);break;}}}});$.jstree.defaults.plugins.push("html_data");})(jQuery);(function($){$.jstree.plugin("themeroller",{__init:function(){var s=this._get_settings().themeroller;this.get_container().addClass("ui-widget-content").addClass("jstree-themeroller").delegate("a","mouseenter.jstree",function(e){if(!$(e.currentTarget).hasClass("jstree-loading")){$(this).addClass(s.item_h);}}).delegate("a","mouseleave.jstree",function(){$(this).removeClass(s.item_h);}).bind("init.jstree",$.proxy(function(e,data){data.inst.get_container().find("> ul > li > .jstree-loading > ins").addClass("ui-icon-refresh");this._themeroller(data.inst.get_container().find("> ul > li"));},this)).bind("open_node.jstree create_node.jstree",$.proxy(function(e,data){this._themeroller(data.rslt.obj);},this)).bind("loaded.jstree refresh.jstree",$.proxy(function(e){this._themeroller();},this)).bind("close_node.jstree",$.proxy(function(e,data){this._themeroller(data.rslt.obj);},this)).bind("delete_node.jstree",$.proxy(function(e,data){this._themeroller(data.rslt.parent);},this)).bind("correct_state.jstree",$.proxy(function(e,data){data.rslt.obj.children("ins.jstree-icon").removeClass(s.opened+" "+s.closed+" ui-icon").end().find("> a > ins.ui-icon").filter(function(){return this.className.toString().replace(s.item_clsd,"").replace(s.item_open,"").replace(s.item_leaf,"").indexOf("ui-icon-")===-1;}).removeClass(s.item_open+" "+s.item_clsd).addClass(s.item_leaf||"jstree-no-icon");},this)).bind("select_node.jstree",$.proxy(function(e,data){data.rslt.obj.children("a").addClass(s.item_a);},this)).bind("deselect_node.jstree deselect_all.jstree",$.proxy(function(e,data){this.get_container().find("a."+s.item_a).removeClass(s.item_a).end().find("a.jstree-clicked").addClass(s.item_a);},this)).bind("dehover_node.jstree",$.proxy(function(e,data){data.rslt.obj.children("a").removeClass(s.item_h);},this)).bind("hover_node.jstree",$.proxy(function(e,data){this.get_container().find("a."+s.item_h).not(data.rslt.obj).removeClass(s.item_h);data.rslt.obj.children("a").addClass(s.item_h);},this)).bind("move_node.jstree",$.proxy(function(e,data){this._themeroller(data.rslt.o);this._themeroller(data.rslt.op);},this));},__destroy:function(){var s=this._get_settings().themeroller,c=["ui-icon"];$.each(s,function(i,v){v=v.split(" ");if(v.length){c=c.concat(v);}});this.get_container().removeClass("ui-widget-content").find("."+c.join(", .")).removeClass(c.join(" "));},_fn:{_themeroller:function(obj){var s=this._get_settings().themeroller;obj=!obj||obj==-1?this.get_container_ul():this._get_node(obj).parent();obj.find("li.jstree-closed").children("ins.jstree-icon").removeClass(s.opened).addClass("ui-icon "+s.closed).end().children("a").addClass(s.item).children("ins.jstree-icon").addClass("ui-icon").filter(function(){return this.className.toString().replace(s.item_clsd,"").replace(s.item_open,"").replace(s.item_leaf,"").indexOf("ui-icon-")===-1;}).removeClass(s.item_leaf+" "+s.item_open).addClass(s.item_clsd||"jstree-no-icon").end().end().end().end().find("li.jstree-open").children("ins.jstree-icon").removeClass(s.closed).addClass("ui-icon "+s.opened).end().children("a").addClass(s.item).children("ins.jstree-icon").addClass("ui-icon").filter(function(){return this.className.toString().replace(s.item_clsd,"").replace(s.item_open,"").replace(s.item_leaf,"").indexOf("ui-icon-")===-1;}).removeClass(s.item_leaf+" "+s.item_clsd).addClass(s.item_open||"jstree-no-icon").end().end().end().end().find("li.jstree-leaf").children("ins.jstree-icon").removeClass(s.closed+" ui-icon "+s.opened).end().children("a").addClass(s.item).children("ins.jstree-icon").addClass("ui-icon").filter(function(){return this.className.toString().replace(s.item_clsd,"").replace(s.item_open,"").replace(s.item_leaf,"").indexOf("ui-icon-")===-1;}).removeClass(s.item_clsd+" "+s.item_open).addClass(s.item_leaf||"jstree-no-icon");}},defaults:{"opened":"ui-icon-triangle-1-se","closed":"ui-icon-triangle-1-e","item":"ui-state-default","item_h":"ui-state-hover","item_a":"ui-state-active","item_open":"ui-icon-folder-open","item_clsd":"ui-icon-folder-collapsed","item_leaf":"ui-icon-document"}});$(function(){var css_string=''+'.jstree-themeroller .ui-icon { overflow:visible; } '+'.jstree-themeroller a { padding:0 2px; } '+'.jstree-themeroller .jstree-no-icon { display:none; }';$.vakata.css.add_sheet({str:css_string,title:"jstree"});});})(jQuery);(function($){$.jstree.plugin("unique",{__init:function(){this.get_container().bind("before.jstree",$.proxy(function(e,data){var nms=[],res=true,p,t;if(data.func=="move_node"){if(data.args[4]===true){if(data.args[0].o&&data.args[0].o.length){data.args[0].o.children("a").each(function(){nms.push($(this).text().replace(/^\s+/g,""));});res=this._check_unique(nms,data.args[0].np.find("> ul > li").not(data.args[0].o),"move_node");}}}
-if(data.func=="create_node"){if(data.args[4]||this._is_loaded(data.args[0])){p=this._get_node(data.args[0]);if(data.args[1]&&(data.args[1]==="before"||data.args[1]==="after")){p=this._get_parent(data.args[0]);if(!p||p===-1){p=this.get_container();}}
-if(typeof data.args[2]==="string"){nms.push(data.args[2]);}
-else if(!data.args[2]||!data.args[2].data){nms.push(this._get_string("new_node"));}
-else{nms.push(data.args[2].data);}
-res=this._check_unique(nms,p.find("> ul > li"),"create_node");}}
-if(data.func=="rename_node"){nms.push(data.args[1]);t=this._get_node(data.args[0]);p=this._get_parent(t);if(!p||p===-1){p=this.get_container();}
-res=this._check_unique(nms,p.find("> ul > li").not(t),"rename_node");}
-if(!res){e.stopPropagation();return false;}},this));},defaults:{error_callback:$.noop},_fn:{_check_unique:function(nms,p,func){var cnms=[];p.children("a").each(function(){cnms.push($(this).text().replace(/^\s+/g,""));});if(!cnms.length||!nms.length){return true;}
-cnms=cnms.sort().join(",,").replace(/(,|^)([^,]+)(,,\2)+(,|$)/g,"$1$2$4").replace(/,,+/g,",").replace(/,$/,"").split(",");if((cnms.length+nms.length)!=cnms.concat(nms).sort().join(",,").replace(/(,|^)([^,]+)(,,\2)+(,|$)/g,"$1$2$4").replace(/,,+/g,",").replace(/,$/,"").split(",").length){this._get_settings().unique.error_callback.call(null,nms,p,func);return false;}
-return true;},check_move:function(){if(!this.__call_old()){return false;}
-var p=this._get_move(),nms=[];if(p.o&&p.o.length){p.o.children("a").each(function(){nms.push($(this).text().replace(/^\s+/g,""));});return this._check_unique(nms,p.np.find("> ul > li").not(p.o),"check_move");}
-return true;}}});})(jQuery);(function($){$.jstree.plugin("wholerow",{__init:function(){if(!this.data.ui){throw"jsTree wholerow: jsTree UI plugin not included.";}
-this.data.wholerow.html=false;this.data.wholerow.to=false;this.get_container().bind("init.jstree",$.proxy(function(e,data){this._get_settings().core.animation=0;},this)).bind("open_node.jstree create_node.jstree clean_node.jstree loaded.jstree",$.proxy(function(e,data){this._prepare_wholerow_span(data&&data.rslt&&data.rslt.obj?data.rslt.obj:-1);},this)).bind("search.jstree clear_search.jstree reopen.jstree after_open.jstree after_close.jstree create_node.jstree delete_node.jstree clean_node.jstree",$.proxy(function(e,data){if(this.data.to){clearTimeout(this.data.to);}
-this.data.to=setTimeout((function(t,o){return function(){t._prepare_wholerow_ul(o);};})(this,data&&data.rslt&&data.rslt.obj?data.rslt.obj:-1),0);},this)).bind("deselect_all.jstree",$.proxy(function(e,data){this.get_container().find(" > .jstree-wholerow .jstree-clicked").removeClass("jstree-clicked "+(this.data.themeroller?this._get_settings().themeroller.item_a:""));},this)).bind("select_node.jstree deselect_node.jstree ",$.proxy(function(e,data){data.rslt.obj.each(function(){var ref=data.inst.get_container().find(" > .jstree-wholerow li:visible:eq("+(parseInt((($(this).offset().top-data.inst.get_container().offset().top+data.inst.get_container()[0].scrollTop)/data.inst.data.core.li_height),10))+")");ref.children("a").attr("class",data.rslt.obj.children("a").attr("class"));});},this)).bind("hover_node.jstree dehover_node.jstree",$.proxy(function(e,data){this.get_container().find(" > .jstree-wholerow .jstree-hovered").removeClass("jstree-hovered "+(this.data.themeroller?this._get_settings().themeroller.item_h:""));if(e.type==="hover_node"){var ref=this.get_container().find(" > .jstree-wholerow li:visible:eq("+(parseInt(((data.rslt.obj.offset().top-this.get_container().offset().top+this.get_container()[0].scrollTop)/this.data.core.li_height),10))+")");ref.children("a").attr("class",data.rslt.obj.children(".jstree-hovered").attr("class"));}},this)).delegate(".jstree-wholerow-span, ins.jstree-icon, li","click.jstree",function(e){var n=$(e.currentTarget);if(e.target.tagName==="A"||(e.target.tagName==="INS"&&n.closest("li").is(".jstree-open, .jstree-closed"))){return;}
-n.closest("li").children("a:visible:eq(0)").click();e.stopImmediatePropagation();}).delegate("li","mouseover.jstree",$.proxy(function(e){e.stopImmediatePropagation();if($(e.currentTarget).children(".jstree-hovered, .jstree-clicked").length){return false;}
-this.hover_node(e.currentTarget);return false;},this)).delegate("li","mouseleave.jstree",$.proxy(function(e){if($(e.currentTarget).children("a").hasClass("jstree-hovered").length){return;}
-this.dehover_node(e.currentTarget);},this));if(is_ie7||is_ie6){$.vakata.css.add_sheet({str:".jstree-"+this.get_index()+" { position:relative; } ",title:"jstree"});}},defaults:{},__destroy:function(){this.get_container().children(".jstree-wholerow").remove();this.get_container().find(".jstree-wholerow-span").remove();},_fn:{_prepare_wholerow_span:function(obj){obj=!obj||obj==-1?this.get_container().find("> ul > li"):this._get_node(obj);if(obj===false){return;}
-obj.each(function(){$(this).find("li").andSelf().each(function(){var $t=$(this);if($t.children(".jstree-wholerow-span").length){return true;}
-$t.prepend("<span class='jstree-wholerow-span' style='width:"+($t.parentsUntil(".jstree","li").length*18)+"px;'>&#160;</span>");});});},_prepare_wholerow_ul:function(){var o=this.get_container().children("ul").eq(0),h=o.html();o.addClass("jstree-wholerow-real");if(this.data.wholerow.last_html!==h){this.data.wholerow.last_html=h;this.get_container().children(".jstree-wholerow").remove();this.get_container().append(o.clone().removeClass("jstree-wholerow-real").wrapAll("<div class='jstree-wholerow' />").parent().width(o.parent()[0].scrollWidth).css("top",(o.height()+(is_ie7?5:0))*-1).find("li[id]").each(function(){this.removeAttribute("id");}).end());}}}});$(function(){var css_string=''+'.jstree .jstree-wholerow-real { position:relative; z-index:1; } '+'.jstree .jstree-wholerow-real li { cursor:pointer; } '+'.jstree .jstree-wholerow-real a { border-left-color:transparent !important; border-right-color:transparent !important; } '+'.jstree .jstree-wholerow { position:relative; z-index:0; height:0; } '+'.jstree .jstree-wholerow ul, .jstree .jstree-wholerow li { width:100%; } '+'.jstree .jstree-wholerow, .jstree .jstree-wholerow ul, .jstree .jstree-wholerow li, .jstree .jstree-wholerow a { margin:0 !important; padding:0 !important; } '+'.jstree .jstree-wholerow, .jstree .jstree-wholerow ul, .jstree .jstree-wholerow li { background:transparent !important; }'+'.jstree .jstree-wholerow ins, .jstree .jstree-wholerow span, .jstree .jstree-wholerow input { display:none !important; }'+'.jstree .jstree-wholerow a, .jstree .jstree-wholerow a:hover { text-indent:-9999px; !important; width:100%; padding:0 !important; border-right-width:0px !important; border-left-width:0px !important; } '+'.jstree .jstree-wholerow-span { position:absolute; left:0; margin:0px; padding:0; height:18px; border-width:0; padding:0; z-index:0; }';if(is_ff2){css_string+=''+'.jstree .jstree-wholerow a { display:block; height:18px; margin:0; padding:0; border:0; } '+'.jstree .jstree-wholerow-real a { border-color:transparent !important; } ';}
-if(is_ie7||is_ie6){css_string+=''+'.jstree .jstree-wholerow, .jstree .jstree-wholerow li, .jstree .jstree-wholerow ul, .jstree .jstree-wholerow a { margin:0; padding:0; line-height:18px; } '+'.jstree .jstree-wholerow a { display:block; height:18px; line-height:18px; overflow:hidden; } ';}
-$.vakata.css.add_sheet({str:css_string,title:"jstree"});});})(jQuery);(function($){var nodeInterface=["getChildren","getChildrenCount","getAttr","getName","getProps"],validateInterface=function(obj,inter){var valid=true;obj=obj||{};inter=[].concat(inter);$.each(inter,function(i,v){if(!$.isFunction(obj[v])){valid=false;return false;}});return valid;};$.jstree.plugin("model",{__init:function(){if(!this.data.json_data){throw"jsTree model: jsTree json_data plugin not included.";}
-this._get_settings().json_data.data=function(n,b){var obj=(n==-1)?this._get_settings().model.object:n.data("jstree_model");if(!validateInterface(obj,nodeInterface)){return b.call(null,false);}
-if(this._get_settings().model.async){obj.getChildren($.proxy(function(data){this.model_done(data,b);},this));}
-else{this.model_done(obj.getChildren(),b);}};},defaults:{object:false,id_prefix:false,async:false},_fn:{model_done:function(data,callback){var ret=[],s=this._get_settings(),_this=this;if(!$.isArray(data)){data=[data];}
-$.each(data,function(i,nd){var r=nd.getProps()||{};r.attr=nd.getAttr()||{};if(nd.getChildrenCount()){r.state="closed";}
-r.data=nd.getName();if(!$.isArray(r.data)){r.data=[r.data];}
-if(_this.data.types&&$.isFunction(nd.getType)){r.attr[s.types.type_attr]=nd.getType();}
-if(r.attr.id&&s.model.id_prefix){r.attr.id=s.model.id_prefix+r.attr.id;}
-if(!r.metadata){r.metadata={};}
-r.metadata.jstree_model=nd;ret.push(r);});callback.call(null,ret);}}});})(jQuery);})();
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/jstree/themes/apple/bg.jpg b/htdocs/includes/jquery/plugins/jstree/themes/apple/bg.jpg
deleted file mode 100644
index 3aad05d8fadd75f8d9e02866f695b486f0b46343..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 331
zcmex=<NpH&0WUXCHwH!~28I+MWcdGvLC~c%IlGd9k%5JQfx!kS^p1hgF(p4Kl_BK-
zP=xXSZH5*GHWn5ZRu(o^RyIyHAm-*^W8>iF;o{=v;^GnD0RsUZK7IjyJ|1CV5fNcw
z8EI*08F@HhWM^mR<>8eO5Ri}(6%>_%OAyQWe}F-dgF%IXk(p7Dfk}{&S&;Gn5r#;h
zvzdX8L;}n#9E^<UqRfm;ECP%SOsHxZ7X~ql2m)0zBIyVESWxKyEe0NDpn5@OK?Zw<
XOYd45;+|jbJ!N~<NG0n8|Nol+zjH3u

diff --git a/htdocs/includes/jquery/plugins/jstree/themes/apple/d.png b/htdocs/includes/jquery/plugins/jstree/themes/apple/d.png
deleted file mode 100644
index 2463ba6df91e1668434abdd623bbca914a4fcbe6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7765
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
b_WuI_=b@>S5J7qt00000NkvXXu0mjf{8{<q

diff --git a/htdocs/includes/jquery/plugins/jstree/themes/apple/dot_for_ie.gif b/htdocs/includes/jquery/plugins/jstree/themes/apple/dot_for_ie.gif
deleted file mode 100644
index c0cc5fda7cfb9539720de442a3caca9c9a3fc4cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 43
vcmZ?wbhEHbWMW`qXkcKFla>7c|G(l-7DfgJMg|=QAOOiQFfqBrF<1it%E1S(

diff --git a/htdocs/includes/jquery/plugins/jstree/themes/apple/style.css b/htdocs/includes/jquery/plugins/jstree/themes/apple/style.css
deleted file mode 100644
index db7a143e03a..00000000000
--- a/htdocs/includes/jquery/plugins/jstree/themes/apple/style.css
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * jsTree apple theme 1.0
- * Supported features: dots/no-dots, icons/no-icons, focused, loading
- * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search
- */
-
-.jstree-apple > ul { background:url("bg.jpg") left top repeat; }
-.jstree-apple li, 
-.jstree-apple ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }
-.jstree-apple li { background-position:-90px 0; background-repeat:repeat-y;  }
-.jstree-apple li.jstree-last { background:transparent; }
-.jstree-apple .jstree-open > ins { background-position:-72px 0; }
-.jstree-apple .jstree-closed > ins { background-position:-54px 0; }
-.jstree-apple .jstree-leaf > ins { background-position:-36px 0; }
-
-.jstree-apple a { border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; text-shadow:1px 1px 1px white; }
-.jstree-apple .jstree-hovered { background:#e7f4f9; border:1px solid #d8f0fa; padding:0 3px 0 1px; text-shadow:1px 1px 1px silver; }
-.jstree-apple .jstree-clicked { background:#beebff; border:1px solid #99defd; padding:0 3px 0 1px; }
-.jstree-apple a .jstree-icon { background-position:-56px -20px; }
-.jstree-apple a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }
-
-.jstree-apple.jstree-focused { background:white; }
-
-.jstree-apple .jstree-no-dots li, 
-.jstree-apple .jstree-no-dots .jstree-leaf > ins { background:transparent; }
-.jstree-apple .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
-.jstree-apple .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
-
-.jstree-apple .jstree-no-icons a .jstree-icon { display:none; }
-
-.jstree-apple .jstree-search { font-style:italic; }
-
-.jstree-apple .jstree-no-icons .jstree-checkbox { display:inline-block; }
-.jstree-apple .jstree-no-checkboxes .jstree-checkbox { display:none !important; }
-.jstree-apple .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; }
-.jstree-apple .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; }
-.jstree-apple .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; }
-.jstree-apple .jstree-checked > a > .checkbox:hover { background-position:-38px -37px; }
-.jstree-apple .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; }
-.jstree-apple .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }
-
-#vakata-dragged.jstree-apple ins { background:transparent !important; }
-#vakata-dragged.jstree-apple .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }
-#vakata-dragged.jstree-apple .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }
-#jstree-marker.jstree-apple { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }
-
-.jstree-apple a.jstree-search { color:aqua; }
-.jstree-apple .jstree-locked a { color:silver; cursor:default; }
-
-#vakata-contextmenu.jstree-apple-context, 
-#vakata-contextmenu.jstree-apple-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
-#vakata-contextmenu.jstree-apple-context li { }
-#vakata-contextmenu.jstree-apple-context a { color:black; }
-#vakata-contextmenu.jstree-apple-context a:hover, 
-#vakata-contextmenu.jstree-apple-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
-#vakata-contextmenu.jstree-apple-context li.jstree-contextmenu-disabled a, 
-#vakata-contextmenu.jstree-apple-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }
-#vakata-contextmenu.jstree-apple-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
-#vakata-contextmenu.jstree-apple-context li ul { margin-left:-4px; }
-
-/* TODO: IE6 support - the `>` selectors */
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/jstree/themes/apple/throbber.gif b/htdocs/includes/jquery/plugins/jstree/themes/apple/throbber.gif
deleted file mode 100644
index 5b33f7e54f4e55b6b8774d86d96895db9af044b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1849
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
EAHN$8j{pDw

diff --git a/htdocs/includes/jquery/plugins/jstree/themes/classic/d.gif b/htdocs/includes/jquery/plugins/jstree/themes/classic/d.gif
deleted file mode 100644
index 6eb0004ce3544f9973ddbd5a2c450fc0e1a354b1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3003
zcmV;s3q<rsNk%w1VQc_M0QUd@|NsC0|Cs;)0Dypi9UU9p+1%RH+SJd~?dk2Qrm3f-
zr}gvo>*?$F^Z2Nxspa73@a^*3*xl*o?4_ipq@$(g<msKA<aBhWu&~|0z}<g;hoYjS
z?d|T)&*pl4mU4B3YHfIdhnPJ=PGDtm0yeN!Sz=30RiUM>C@(!<XLnp+XqTFxT4Quu
zWOZ6$Zj_jxSYK=4;^q4L{O#`V?CtH};NbW9`0MTLt--SD?(3YlpwQpa$k@tbq+{;%
z?(z2VSDsX-xu!;KLlJ)lD2pF9kt~y&lDgBj8;k{*otGVz0W+B!S*b@Nod6=01SOgR
zI-wm_tvxHG04bmVC!GLGlQC?yRCc>wF|7bGssJvh0BX5QjLLI0uK+r-1cJq8jnZzJ
z(1Jv`3|Yb@WVJo4+Lz1fyh6MKOT7?KzZFoy7GlRPXvs2&(_xX<Y?|76bksY0(?^Kj
zQnl=nmgiib=xnX-d)W2C&-<su|B9=}h>*BiZ-X-1+{XX^o&W#3%*?I#@QMHUle)H$
z|L=+a>x9?1K>p)@+P`ei!<@#N8OE9#%%LRQxl;ezb>g!_{nc>))Nh+<1E6jQrE?9d
zc@wdJ8MuWYz>O%zlP<}YG0d4X+qZG$+s5Czh~~tX=+n0M>)ZJ4-udt1`ts-9qFLUk
zW8kW0-l=Bbt7zY<XyL4C;jL`ntZU(}ZS2vn@!7of<<a)&*7xby`R?HQ^62~X>ihKU
z*_c=8$ENe(%=z!-`}Obq_wxSy`j(ZH^4i1t@#)>0W!{}=-kxgTplslza`4l;@z%ie
z+{yLg()Q%l_U734=-c<{-T3R^?#!|I?Be?I>izll@Bjeh008O%0oDQn$^rtW0s_1P
z1L+SBuMG|F6cn}=7WXSF$tx@HJw4P(N%m`N_Kb}DtE>OX$^YKo{rvp6x3{FDqx$;#
z_V)Jj^78TV@$c{N?Ck97>gws~>F4L?<>lq#;^N)i-P+pP)z#I_&CRK)sidT&qobpt
zp`n_Zn*aa*A^8LW00930EC2ui0BitA000R80RIUbNU)&6g9sBUT*$DY!-o(d5{Nia
zBE^UpGiuz(vE#;y4?#K<*^s2ilPFU<9Kf<=%Y-gtmTVZ)CCr*EXEGcBpr=m&17QC2
z85AYYp+JQqEqd}O00Bgm4rQv)<UyxUdr~dv^ygNDRt;i}im)r$rarSKEsJz5S^;q3
zx)u90F4V6FC+huYm8adie6QAxn>6e|!vx1_mFhL6;<;Sg;??+g@;|eSjix<Icd5>W
zm?0;Y?3grL&qi@tR&5z0>zg<~tDH@{w(Z-q5#!#?ySML?x_=8FPMo-IfBpC==hv^f
z^M3vaBBwBcg7xbY)Ipb?e7W}t6SmL){%|4$2oE7lZ0u*xo%{Fj=k+7V&mB7-Kl1DM
zVZ$9i`tGbF;DG4J;DZkf{AbW63~HhYMk}bGK?fz607F8$@gvVW@o?~tJMApMjt%Ru
zqo6<&xN}4qX0+(y5j?m<0e}b~AWw(xG_XS%Wz?|2f<FE62PO-tVC0b%4v>KeE~t=#
zM*PeZ4?XkT=pl&gv~%J=3fvGz9(dd#CLUy#af1Q`?Xv(6M^tbl1U!^6#~fiKQP3uw
zG@_@ToM3XvC6-uXkP1Vs!+{1Fm;gWtPv*5yl=IY64?Q>1z=1mpXi1O*Iebw^9d?9j
z$DCZ`faX9O?7+nvM@YZ`4`I~*;f5Pm7;$G?KUFd)03`I<D*%X=uqX=}?GvdzHB4G%
zhwW%OkOMbdAqO4Q(gA85TioCPK}J{sM;vj$_yrr}ZgIqX1Zfh0AMCc<ZUB@BP!OTM
z{;B~6!j?d+qY4>Y!#&6<d*eIK3Iy#H-^L-w!fc$u1P$8`WJDBVh;arPTZqvG7Es`@
zz&-_K62QnLmkh7G1kqbBu=oyJ>^%11bI(0BBuga?1^)xB6=SSH?iy-%fyKiSqsT)Q
zT6Cdw7E&yM0|Yt$BeEb=S6y`glb}41%D%Fk@4g1<X6!xq$PBQ}^5pCQ4NQ1Zu^2*U
zp~b@q5HvvpI26&u6jL<+u|yCO$m3r@m;^w`;fN!SwblZ0ZEwpZwD9sh`IJ2~%{9=I
za{_EPK?UD@KcPevG}JxNKJFNhw-QPap~C}{4o*<vhtzJn?Ey%__&<aq^??P7G78p0
z#^RGt<(30n&*n4qpo9}oMDK(WNc1p6(f^>H&jC18QG^Z=%v^))0~PMb`RJpc`|kg=
z;Qsq9fM5X%?th@s1oIrPKl1pr2l7A@Xh#r$K)?b5p$8tDK$_T5wgMah2gpj+JWN!O
zO9UVi7|dV>*JqFzc+i6&_?-nVP=a4@V0a4QM?7r6juy6%L;|AVK>9I{cW{6PILzS;
z+#w%=uxB1Xl!rY3fJj7ppo<`YvP2~+L5U_#LK3=ThzTs<fe%~&cqh<^Klq`KE_(5c
z6Nt`0kTZb<nDLBe438KEf}DN05j^|wj(8067rQhh9V19V2um=67oe~>fDEJ{cN3gJ
z8uE~c#Lz-;A&g--au~vhq$Gub3xbrw6sK54DpGNZQ*4rxrYMCaO`(cXqT-aOP(><Q
z5z2!wXcG<+q%e{Zj9S|Amdp?aK~6!6UXbDzzzk+DYjFyKprRJjNTxD<;R{mK;ufj^
zQcq+c10vZ*H^XSgE}RjKT?7M|z37E6crgruq=FPHa?y);Kum(Dq86eMMJPlu3R3W*
z4?NNZDsJWfE<XUkPe~NcFqq*CWh|o^&*<hidvS|$4rCRy_)?h0R3=)i!ko7NMJ{A9
z&t2eiPI?d}K{f$^ezMCax=IN)nZXQQ7_=GAc*ZV%*-(P8LKL0?m8eKX3s$(Z6RQHm
zJV6nwS?!^c=>mY&mg<Li{e~FKP)0Ibx(sF@G#b*7hC>Cy3R+03TGp}ywrJrBg5bhi
z-~z-e_CPK+Y~d58Ac!L7O4qt7q7j8~DoS(%Rb2oh8Ocz_OP#R`t=iP930s&P8pecC
zlyxAuAVbA2ma&aNArZGog<RKV(f}Yr5r@dyQ<;&BV<6+NRAt693_B24(1K?^V*}8H
z*4W4Y3M3VvK$_CJz_cYKVi(ZdtRI#t2tNcu5s(n=UKavYU>w7=e+{fMn!#FuxMCD-
zdt2P*=2(KXf)}2s!ruC}gh7NN6t#%vW)p`vKQQ7EQS=Q|kpYe8BIC4ET}E~Paa|^O
z4s=rxT@<=IkW|zH7U5+b5e5+pUBn{21yRJhZdW@$7=jV;1rBqWaSUkG*S>#M#(uBs
zJm^V}dOaA0PYX<nR~*9=d?>;ofI(wjKsdqyNFVwRv4{-wrWnkCMlOcz;SU2N7{nmR
zDr_-80}>E{nKdUbU;ztYe8LmD$Z{-X(F^s;wTWP!gqWeoK8|418NJ{|IM=MqUTpRM
zAEuZEDMmqyI@`IPvxw_JOreWe`1!nk_OmQ>p=UbQ5iY~Q#W0M)=teub7)TY!C0F5!
zN?W?psc7XuF8Rq;v?3LyETyIaS;$11`qY9fHL6$5YTl?iBIGbgtXpjxFd$?c<(RcV
z%5jcz(E5)UdBYv%V32EUBOK(IH95*r4s-Y#A@G35uM@%qgMeWUZzzKs2$BtKRHGW*
z7)P>`&Fpf31KL55wyA>?2RmGWAYiCN8|EE_f@I?w)vyLN!Z8kUC;Qyc7DBqGO^`9b
z;agh}$QIbpGd4isAosS0zQ57$aR5Bv0$2ATbpwSopy3Q^hyoeVuv;f2L>u3jrUo@A
zE{=u3LkKV*IKltngxz`}ZdpKrLcE>tiI2nOFwZz53yB1|X+a7|*ZIk>f$yHL{O1XI
zxzJ}mkRebZdQTXFLbQPmY%rba-?qj#S{`tj5B(uSaDo%Go{(&KgX>-A#=XCNY;T}j
x<5VXI5s1JLw_`&a*$_y#t8oo(L>=#Er%g8G&TYWw{qcc(HRLA`dBX$*06T}^)2ILd

diff --git a/htdocs/includes/jquery/plugins/jstree/themes/classic/d.png b/htdocs/includes/jquery/plugins/jstree/themes/classic/d.png
deleted file mode 100644
index 275daeca2d6ae2ba9cf59bd23a194d13a35a825d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7535
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
FV1ky2eG>ox

diff --git a/htdocs/includes/jquery/plugins/jstree/themes/classic/dot_for_ie.gif b/htdocs/includes/jquery/plugins/jstree/themes/classic/dot_for_ie.gif
deleted file mode 100644
index c0cc5fda7cfb9539720de442a3caca9c9a3fc4cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 43
vcmZ?wbhEHbWMW`qXkcKFla>7c|G(l-7DfgJMg|=QAOOiQFfqBrF<1it%E1S(

diff --git a/htdocs/includes/jquery/plugins/jstree/themes/classic/style.css b/htdocs/includes/jquery/plugins/jstree/themes/classic/style.css
deleted file mode 100644
index 492856ddc72..00000000000
--- a/htdocs/includes/jquery/plugins/jstree/themes/classic/style.css
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * jsTree classic theme 1.0
- * Supported features: dots/no-dots, icons/no-icons, focused, loading
- * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search
- */
-
-.jstree-classic li, 
-.jstree-classic ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }
-.jstree-classic li { background-position:-90px 0; background-repeat:repeat-y;  }
-.jstree-classic li.jstree-last { background:transparent; }
-.jstree-classic .jstree-open > ins { background-position:-72px 0; }
-.jstree-classic .jstree-closed > ins { background-position:-54px 0; }
-.jstree-classic .jstree-leaf > ins { background-position:-36px 0; }
-
-.jstree-classic .jstree-hovered { background:#e7f4f9; border:1px solid #e7f4f9; padding:0 2px 0 1px; }
-.jstree-classic .jstree-clicked { background:navy; border:1px solid navy; padding:0 2px 0 1px; color:white; }
-.jstree-classic a .jstree-icon { background-position:-56px -19px; }
-.jstree-classic .jstree-open > a .jstree-icon { background-position:-56px -36px; }
-.jstree-classic a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }
-
-.jstree-classic.jstree-focused { background:white; }
-
-.jstree-classic .jstree-no-dots li, 
-.jstree-classic .jstree-no-dots .jstree-leaf > ins { background:transparent; }
-.jstree-classic .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
-.jstree-classic .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
-
-.jstree-classic .jstree-no-icons a .jstree-icon { display:none; }
-
-.jstree-classic .jstree-search { font-style:italic; }
-
-.jstree-classic .jstree-no-icons .jstree-checkbox { display:inline-block; }
-.jstree-classic .jstree-no-checkboxes .jstree-checkbox { display:none !important; }
-.jstree-classic .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; }
-.jstree-classic .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; }
-.jstree-classic .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; }
-.jstree-classic .jstree-checked > a > .jstree-checkbox:hover { background-position:-38px -37px; }
-.jstree-classic .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; }
-.jstree-classic .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }
-
-#vakata-dragged.jstree-classic ins { background:transparent !important; }
-#vakata-dragged.jstree-classic .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }
-#vakata-dragged.jstree-classic .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }
-#jstree-marker.jstree-classic { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }
-
-.jstree-classic a.jstree-search { color:aqua; }
-.jstree-classic .jstree-locked a { color:silver; cursor:default; }
-
-#vakata-contextmenu.jstree-classic-context, 
-#vakata-contextmenu.jstree-classic-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
-#vakata-contextmenu.jstree-classic-context li { }
-#vakata-contextmenu.jstree-classic-context a { color:black; }
-#vakata-contextmenu.jstree-classic-context a:hover, 
-#vakata-contextmenu.jstree-classic-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
-#vakata-contextmenu.jstree-classic-context li.jstree-contextmenu-disabled a, 
-#vakata-contextmenu.jstree-classic-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }
-#vakata-contextmenu.jstree-classic-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
-#vakata-contextmenu.jstree-classic-context li ul { margin-left:-4px; }
-
-/* IE6 BEGIN */
-.jstree-classic li, 
-.jstree-classic ins,
-#vakata-dragged.jstree-classic .jstree-invalid, 
-#vakata-dragged.jstree-classic .jstree-ok, 
-#jstree-marker.jstree-classic { _background-image:url("d.gif"); }
-.jstree-classic .jstree-open ins { _background-position:-72px 0; }
-.jstree-classic .jstree-closed ins { _background-position:-54px 0; }
-.jstree-classic .jstree-leaf ins { _background-position:-36px 0; }
-.jstree-classic .jstree-open a ins.jstree-icon { _background-position:-56px -36px; }
-.jstree-classic .jstree-closed a ins.jstree-icon { _background-position:-56px -19px; }
-.jstree-classic .jstree-leaf a ins.jstree-icon { _background-position:-56px -19px; }
-#vakata-contextmenu.jstree-classic-context ins { _display:none; }
-#vakata-contextmenu.jstree-classic-context li { _zoom:1; }
-.jstree-classic .jstree-undetermined a .jstree-checkbox { _background-position:-20px -19px; }
-.jstree-classic .jstree-checked a .jstree-checkbox { _background-position:-38px -19px; }
-.jstree-classic .jstree-unchecked a .jstree-checkbox { _background-position:-2px -19px; }
-/* IE6 END */
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/jstree/themes/classic/throbber.gif b/htdocs/includes/jquery/plugins/jstree/themes/classic/throbber.gif
deleted file mode 100644
index 5b33f7e54f4e55b6b8774d86d96895db9af044b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1849
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
EAHN$8j{pDw

diff --git a/htdocs/includes/jquery/plugins/jstree/themes/default-rtl/d.gif b/htdocs/includes/jquery/plugins/jstree/themes/default-rtl/d.gif
deleted file mode 100644
index d85aba049b5c45649fcbb889a3765c39f3a3678a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2872
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
Wyk?VI+|VR%xy)xy^O_GNAOJf<b&a<G

diff --git a/htdocs/includes/jquery/plugins/jstree/themes/default-rtl/d.png b/htdocs/includes/jquery/plugins/jstree/themes/default-rtl/d.png
deleted file mode 100644
index 5179cf64e4adc0a09bf0d0e321cf5665d722f5a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7459
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

diff --git a/htdocs/includes/jquery/plugins/jstree/themes/default-rtl/dots.gif b/htdocs/includes/jquery/plugins/jstree/themes/default-rtl/dots.gif
deleted file mode 100644
index 00433648c0769d3b473e6c972e6314f16e5a29f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 132
zcmZ?wbhEHb6k^C>XkcKFm6iVg|G(l-7DfgJMg|=QAOOiQFh%$DujG2o@7!&2t}F81
zi%)NALp7pQE0R)nt;u<`&t1p+tMlofyEoVVvS#&m4*XdBM8(|u%G$3jZi&HJrDaFc
ka&IroI(@dv{ej`poLAGXzuGqAZ(00B0V}?F8Vn590H|{~1^@s6

diff --git a/htdocs/includes/jquery/plugins/jstree/themes/default-rtl/style.css b/htdocs/includes/jquery/plugins/jstree/themes/default-rtl/style.css
deleted file mode 100644
index d51aef6cc02..00000000000
--- a/htdocs/includes/jquery/plugins/jstree/themes/default-rtl/style.css
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * jsTree default-rtl theme 1.0
- * Supported features: dots/no-dots, icons/no-icons, focused, loading
- * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search
- */
-
-.jstree-default-rtl li, 
-.jstree-default-rtl ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }
-.jstree-default-rtl li { background-position:-90px 0; background-repeat:repeat-y; }
-.jstree-default-rtl li.jstree-last { background:transparent; }
-.jstree-default-rtl .jstree-open > ins { background-position:-72px 0; }
-.jstree-default-rtl .jstree-closed > ins { background-position:-54px 0; }
-.jstree-default-rtl .jstree-leaf > ins { background-position:-36px 0; }
-
-.jstree-default-rtl .jstree-hovered { background:#e7f4f9; border:1px solid #d8f0fa; padding:0 2px 0 1px; }
-.jstree-default-rtl .jstree-clicked { background:#beebff; border:1px solid #99defd; padding:0 2px 0 1px; }
-.jstree-default-rtl a .jstree-icon { background-position:-56px -19px; }
-.jstree-default-rtl a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }
-
-.jstree-default-rtl.jstree-focused { background:#ffffee; }
-
-.jstree-default-rtl .jstree-no-dots li, 
-.jstree-default-rtl .jstree-no-dots .jstree-leaf > ins { background:transparent; }
-.jstree-default-rtl .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
-.jstree-default-rtl .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
-
-.jstree-default-rtl .jstree-no-icons a .jstree-icon { display:none; }
-
-.jstree-default-rtl .jstree-search { font-style:italic; }
-
-.jstree-default-rtl .jstree-no-icons .jstree-checkbox { display:inline-block; }
-.jstree-default-rtl .jstree-no-checkboxes .jstree-checkbox { display:none !important; }
-.jstree-default-rtl .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; }
-.jstree-default-rtl .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; }
-.jstree-default-rtl .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; }
-.jstree-default-rtl .jstree-checked > a > .jstree-checkbox:hover { background-position:-38px -37px; }
-.jstree-default-rtl .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; }
-.jstree-default-rtl .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }
-
-#vakata-dragged.jstree-default-rtl ins { background:transparent !important; }
-#vakata-dragged.jstree-default-rtl .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }
-#vakata-dragged.jstree-default-rtl .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }
-#jstree-marker.jstree-default-rtl { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }
-
-.jstree-default-rtl a.jstree-search { color:aqua; }
-.jstree-default-rtl .jstree-locked a { color:silver; cursor:default; }
-
-#vakata-contextmenu.jstree-default-rtl-context, 
-#vakata-contextmenu.jstree-default-rtl-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
-#vakata-contextmenu.jstree-default-rtl-context li { }
-#vakata-contextmenu.jstree-default-rtl-context a { color:black; }
-#vakata-contextmenu.jstree-default-rtl-context a:hover, 
-#vakata-contextmenu.jstree-default-rtl-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
-#vakata-contextmenu.jstree-default-rtl-context li.jstree-contextmenu-disabled a, 
-#vakata-contextmenu.jstree-default-rtl-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }
-#vakata-contextmenu.jstree-default-rtl-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
-#vakata-contextmenu.jstree-default-rtl-context li ul { margin-left:-4px; }
-
-/* IE6 BEGIN */
-.jstree-default-rtl li, 
-.jstree-default-rtl ins,
-#vakata-dragged.jstree-default-rtl .jstree-invalid, 
-#vakata-dragged.jstree-default-rtl .jstree-ok, 
-#jstree-marker.jstree-default-rtl { _background-image:url("d.gif"); }
-.jstree-default-rtl .jstree-open ins { _background-position:-72px 0; }
-.jstree-default-rtl .jstree-closed ins { _background-position:-54px 0; }
-.jstree-default-rtl .jstree-leaf ins { _background-position:-36px 0; }
-.jstree-default-rtl a ins.jstree-icon { _background-position:-56px -19px; }
-#vakata-contextmenu.jstree-default-rtl-context ins { _display:none; }
-#vakata-contextmenu.jstree-default-rtl-context li { _zoom:1; }
-.jstree-default-rtl .jstree-undetermined a .jstree-checkbox { _background-position:-18px -19px; }
-.jstree-default-rtl .jstree-checked a .jstree-checkbox { _background-position:-36px -19px; }
-.jstree-default-rtl .jstree-unchecked a .jstree-checkbox { _background-position:0px -19px; }
-/* IE6 END */
-
-/* RTL part */
-.jstree-default-rtl .jstree-hovered, .jstree-default-rtl .jstree-clicked { padding:0 1px 0 2px; }
-.jstree-default-rtl li { background-image:url("dots.gif"); background-position: 100% 0px; }
-.jstree-default-rtl .jstree-checked > a > .jstree-checkbox { background-position:-36px -19px; margin-left:2px; }
-.jstree-default-rtl .jstree-unchecked > a > .jstree-checkbox { background-position:0px -19px; margin-left:2px; }
-.jstree-default-rtl .jstree-undetermined > a > .jstree-checkbox { background-position:-18px -19px; margin-left:2px; }
-.jstree-default-rtl .jstree-checked > a > .jstree-checkbox:hover { background-position:-36px -37px; }
-.jstree-default-rtl .jstree-unchecked > a > .jstree-checkbox:hover { background-position:0px -37px; }
-.jstree-default-rtl .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-18px -37px; }
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/jstree/themes/default-rtl/throbber.gif b/htdocs/includes/jquery/plugins/jstree/themes/default-rtl/throbber.gif
deleted file mode 100644
index 5b33f7e54f4e55b6b8774d86d96895db9af044b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1849
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
EAHN$8j{pDw

diff --git a/htdocs/includes/jquery/plugins/jstree/themes/default/d.gif b/htdocs/includes/jquery/plugins/jstree/themes/default/d.gif
deleted file mode 100644
index 0e958d38716d93d4050a993398dec77490f836c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2944
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

diff --git a/htdocs/includes/jquery/plugins/jstree/themes/default/d.png b/htdocs/includes/jquery/plugins/jstree/themes/default/d.png
deleted file mode 100644
index 8540175a04b0cd303e3966d1727f30ee9b8a7254..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7635
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
B#iIZK

diff --git a/htdocs/includes/jquery/plugins/jstree/themes/default/style.css b/htdocs/includes/jquery/plugins/jstree/themes/default/style.css
deleted file mode 100644
index 238ce1a1c4b..00000000000
--- a/htdocs/includes/jquery/plugins/jstree/themes/default/style.css
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * jsTree default theme 1.0
- * Supported features: dots/no-dots, icons/no-icons, focused, loading
- * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search
- */
-
-.jstree-default li, 
-.jstree-default ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }
-.jstree-default li { background-position:-90px 0; background-repeat:repeat-y; }
-.jstree-default li.jstree-last { background:transparent; }
-.jstree-default .jstree-open > ins { background-position:-72px 0; }
-.jstree-default .jstree-closed > ins { background-position:-54px 0; }
-.jstree-default .jstree-leaf > ins { background-position:-36px 0; }
-
-.jstree-default .jstree-hovered { background:#e7f4f9; border:1px solid #d8f0fa; padding:0 2px 0 1px; }
-.jstree-default .jstree-clicked { background:#beebff; border:1px solid #99defd; padding:0 2px 0 1px; }
-.jstree-default a .jstree-icon { background-position:-56px -19px; }
-.jstree-default a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }
-
-.jstree-default.jstree-focused { background:#ffffee; }
-
-.jstree-default .jstree-no-dots li, 
-.jstree-default .jstree-no-dots .jstree-leaf > ins { background:transparent; }
-.jstree-default .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
-.jstree-default .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
-
-.jstree-default .jstree-no-icons a .jstree-icon { display:none; }
-
-.jstree-default .jstree-search { font-style:italic; }
-
-.jstree-default .jstree-no-icons .jstree-checkbox { display:inline-block; }
-.jstree-default .jstree-no-checkboxes .jstree-checkbox { display:none !important; }
-.jstree-default .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; }
-.jstree-default .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; }
-.jstree-default .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; }
-.jstree-default .jstree-checked > a > .jstree-checkbox:hover { background-position:-38px -37px; }
-.jstree-default .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; }
-.jstree-default .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }
-
-#vakata-dragged.jstree-default ins { background:transparent !important; }
-#vakata-dragged.jstree-default .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }
-#vakata-dragged.jstree-default .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }
-#jstree-marker.jstree-default { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }
-
-.jstree-default a.jstree-search { color:aqua; }
-.jstree-default .jstree-locked a { color:silver; cursor:default; }
-
-#vakata-contextmenu.jstree-default-context, 
-#vakata-contextmenu.jstree-default-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
-#vakata-contextmenu.jstree-default-context li { }
-#vakata-contextmenu.jstree-default-context a { color:black; }
-#vakata-contextmenu.jstree-default-context a:hover, 
-#vakata-contextmenu.jstree-default-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
-#vakata-contextmenu.jstree-default-context li.jstree-contextmenu-disabled a, 
-#vakata-contextmenu.jstree-default-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }
-#vakata-contextmenu.jstree-default-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
-#vakata-contextmenu.jstree-default-context li ul { margin-left:-4px; }
-
-/* IE6 BEGIN */
-.jstree-default li, 
-.jstree-default ins,
-#vakata-dragged.jstree-default .jstree-invalid, 
-#vakata-dragged.jstree-default .jstree-ok, 
-#jstree-marker.jstree-default { _background-image:url("d.gif"); }
-.jstree-default .jstree-open ins { _background-position:-72px 0; }
-.jstree-default .jstree-closed ins { _background-position:-54px 0; }
-.jstree-default .jstree-leaf ins { _background-position:-36px 0; }
-.jstree-default a ins.jstree-icon { _background-position:-56px -19px; }
-#vakata-contextmenu.jstree-default-context ins { _display:none; }
-#vakata-contextmenu.jstree-default-context li { _zoom:1; }
-.jstree-default .jstree-undetermined a .jstree-checkbox { _background-position:-20px -19px; }
-.jstree-default .jstree-checked a .jstree-checkbox { _background-position:-38px -19px; }
-.jstree-default .jstree-unchecked a .jstree-checkbox { _background-position:-2px -19px; }
-/* IE6 END */
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/jstree/themes/default/throbber.gif b/htdocs/includes/jquery/plugins/jstree/themes/default/throbber.gif
deleted file mode 100644
index 5b33f7e54f4e55b6b8774d86d96895db9af044b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1849
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
EAHN$8j{pDw

diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index 80a07bd88fa..1ab5f9a7570 100755
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -1472,7 +1472,7 @@ table.cal_event {
 	margin-bottom:1px;
 }
 
-ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; -webkit-padding-start: 0px; -webkit-padding-start: 0px; }
+ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; padding-left: 0px; padding-start: 0px; -khtml-padding-start: 0px; -o-padding-start: 0px; -webkit-padding-start: 0px; -webkit-padding-start: 0px; }
 li.cal_event       { border: none; list-style-type: none; }
 
 .cal_event a:link {
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index 68012ee1491..94a07d52ea8 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -1692,7 +1692,7 @@ table.cal_month    { border-spacing: 0px; }
 .cal_today         { background: #FFFFFF; border: solid 2px #6C7C7B; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 table.cal_event    { border-collapse: collapse; margin-bottom: 1px; }
 table.cal_event td { border: 0px; padding-<?php print $left; ?>: 0px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
-ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; -webkit-padding-start: 0px; -webkit-padding-start: 0px; }
+ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; padding-left: 0px; padding-start: 0px; -khtml-padding-start: 0px; -o-padding-start: 0px; -webkit-padding-start: 0px; -webkit-padding-start: 0px; }
 li.cal_event       { border: none; list-style-type: none; }
 .cal_event a:link    { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; }
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 8f8238c15db..0c7b980ca29 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -1858,7 +1858,7 @@ table.cal_month    { border-spacing: 0px; }
 .cal_today         { background: #FFFFFF; border: solid 2px #C0C0C0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 table.cal_event    { border-collapse: collapse; margin-bottom: 1px; }
 table.cal_event td { border: 0px; padding-<?php print $left; ?>: 0px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
-ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; -webkit-padding-start: 0px; -webkit-padding-start: 0px; }
+ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; padding-left: 0px; padding-start: 0px; -khtml-padding-start: 0px; -o-padding-start: 0px; -webkit-padding-start: 0px; -webkit-padding-start: 0px; }
 li.cal_event       { border: none; list-style-type: none; }
 .cal_event a:link    { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; }
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index c025a98d126..03a862da42f 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -1792,7 +1792,7 @@ table.cal_month    { border-spacing: 0px; }
 .cal_today         { background: #FFFFFF; border: solid 2px #C0C0C0; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 table.cal_event    { border-collapse: collapse; margin-bottom: 1px; }
 table.cal_event td { border: 0px; padding-<?php print $left; ?>: 0px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
-ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; -webkit-padding-start: 0px; -webkit-padding-start: 0px; }
+ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; padding-left: 0px; padding-start: 0px; -khtml-padding-start: 0px; -o-padding-start: 0px; -webkit-padding-start: 0px; -webkit-padding-start: 0px; }
 li.cal_event       { border: none; list-style-type: none; }
 .cal_event a:link    {font-size: 11px; font-weight: bold !important; }
 .cal_event a:visited {font-size: 11px; font-weight: bold !important; }
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index a1250674380..cbeccbebadc 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2071,7 +2071,7 @@ table.cal_event    { border: none; border-collapse: collapse; margin-bottom: 1px
 						background: -webkit-gradient(linear, left top, left bottom, from(#006aac), to(#00438d));
 						}
 table.cal_event td { border: none; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 2px; padding-top: 0px; padding-bottom: 0px; }
-ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; -moz-padding-start: 0px; -webkit-padding-start: 0px; }
+ul.cal_event       { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; padding-left: 0px; padding-start: 0px; -khtml-padding-start: 0px; -o-padding-start: 0px; -moz-padding-start: 0px; -webkit-padding-start: 0px; }
 li.cal_event       { border: none; list-style-type: none; }
 .cal_event a:link    { color: #111111; font-size: 11px; font-weight: normal !important; }
 .cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; }
@@ -2142,113 +2142,10 @@ li.cal_event       { border: none; list-style-type: none; }
 /* ============================================================================== */
 
 /* CSS for treeview */
+.treeview ul { background-color: transparent !important; margin-top: 0; }
+.treeview li { background-color: transparent !important; padding: 0 0 0 16px !important; min-height: 20px; }
+.treeview .hover { color: black !important; }
 
-/* Lien plier /deplier tout */
-.arbre-switch {
-    text-align: right;
-    padding: 0 5px;
-    margin: 0 0 -18px 0;
-}
-
-/* Arbre */
-ul.arbre {
-    padding: 5px 10px;
-}
-/* strong : A modifier en fonction de la balise choisie */
-ul.arbre strong {
-    font-weight: normal;
-    padding: 0 0 0 20px;
-    margin: 0 0 0 -7px;
-    background-image: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/branch.gif',1) ?>);
-    background-repeat: no-repeat;
-    background-position: 1px 50%;
-}
-ul.arbre strong.arbre-plier {
-    background-image: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/plus.gif',1) ?>);
-    cursor: pointer;
-}
-ul.arbre strong.arbre-deplier {
-    background-image: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/minus.gif',1) ?>);
-    cursor: pointer;
-}
-ul.arbre ul {
-    padding: 0;
-    margin: 0;
-}
-ul.arbre li {
-    padding: 0;
-    margin: 0;
-    list-style: none;
-}
-/* This is to create an indent */
-ul.arbre li li {
-    margin: 0 0 0 16px;
-}
-/* Classe pour masquer */
-.hide {
-    display: none;
-}
-
-img.menuNew
-{
-	display:block;
-	border:0px;
-}
-
-img.menuEdit
-{
-	border: 0px;
-	display: block;
-}
-
-img.menuDel
-{
-	display:none;
-	border: 0px;
-}
-
-div.menuNew
-{
-	margin-top:-20px;
-	margin-<?php print $left; ?>:270px;
-	height:20px;
-	padding:0px;
-	width:30px;
-	position:relative;
-}
-
-div.menuEdit
-{
-	margin-top:-15px;
-	margin-<?php print $left; ?>:250px;
-	height:20px;
-	padding:0px;
-	width:30px;
-	position:relative;
-
-}
-
-div.menuDel
-{
-	margin-top:-20px;
-	margin-<?php print $left; ?>:290px;
-	height:20px;
-	padding:0px;
-	width:30px;
-	position:relative;
-
-}
-
-div.menuFleche
-{
-	margin-top:-16px;
-	margin-<?php print $left; ?>:320px;
-	height:20px;
-	padding:0px;
-	width:30px;
-	position:relative;
-
-}
 
 
 /* ============================================================================== */
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
new file mode 100644
index 00000000000..f95d877859b
--- /dev/null
+++ b/htdocs/user/hierarchy.php
@@ -0,0 +1,250 @@
+<?php
+/* Copyright (C) 2005      Matthieu Valleton    <mv@seeschloss.org>
+ * Copyright (C) 2005      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2007      Patrick Raguin       <patrick.raguin@gmail.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ *
+ * 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/user/hierarchy.php
+ *      \ingroup    user
+ *      \brief      Page of hierarchy view of user module
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
+
+if (! $user->rights->user->user->lire && ! $user->admin)
+	accessforbidden();
+
+$langs->load("users");
+$langs->load("companies");
+
+// Security check (for external users)
+$socid=0;
+if ($user->societe_id > 0)
+	$socid = $user->societe_id;
+
+$sall=GETPOST('sall','alpha');
+$search_user=GETPOST('search_user','alpha');
+
+$userstatic=new User($db);
+$companystatic = new Societe($db);
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+llxHeader();
+
+print_fiche_titre($langs->trans("ListOfUsers"). ' ('.$langs->trans("HierarchicView").')', '<form action="'.DOL_URL_ROOT.'/user/index.php" method="POST"><input type="submit" class="button" style="width:120px" name="viewcal" value="'.dol_escape_htmltag($langs->trans("List")).'"></form>');
+
+
+
+// Charge tableau des categories
+$user_arbo = $userstatic->get_full_tree();
+
+// Define fulltree array
+$fulltree=$user_arbo;
+
+print '<table class="liste" width="100%">';
+
+
+// ----- This section will show a tree from a fulltree array -----
+// $section must also be defined
+// ---------------------------------------------------------------
+
+
+// Root title line
+print '<tr><td>';
+print '<table class="nobordernopadding"><tr class="nobordernopadding">';
+print '<td align="left" width="24">';
+print img_picto_common('','treemenu/base.gif');
+print '</td><td align="left">'.$langs->trans("All");
+print '</td>';
+print '</tr></table></td>';
+print '<td align="right">&nbsp;</td>';
+print '<td align="right">&nbsp;</td>';
+//print '<td align="right">&nbsp;</td>';
+print '</tr>';
+
+
+
+// Define fullpathselected ( _x_y_z ) of $section parameter
+$fullpathselected='';
+if (! empty($section))
+{
+	foreach($fulltree as $key => $val)
+	{
+		//print $val['id']."-".$section."<br>";
+		if ($val['id'] == $section)
+		{
+			$fullpathselected=$val['fullpath'];
+			break;
+		}
+	}
+}
+//print "fullpathselected=".$fullpathselected."<br>";
+
+// Update expandedsectionarray in session
+$expandedsectionarray=array();
+if (isset($_SESSION['dol_catexpandedsectionarray'.$type])) $expandedsectionarray=explode(',',$_SESSION['dol_catexpandedsectionarray'.$type]);
+
+if (! empty($section) && $_GET['sectionexpand'] == 'true')
+{
+	// We add all sections that are parent of opened section
+	$pathtosection=explode('_',$fullpathselected);
+	foreach($pathtosection as $idcursor)
+	{
+		if ($idcursor && ! in_array($idcursor,$expandedsectionarray))	// Not already in array
+		{
+			$expandedsectionarray[]=$idcursor;
+		}
+	}
+	$_SESSION['dol_catexpandedsectionarray'.$type]=join(',',$expandedsectionarray);
+}
+if (! empty($section) && $_GET['sectionexpand'] == 'false')
+{
+	// We removed all expanded sections that are child of the closed section
+	$oldexpandedsectionarray=$expandedsectionarray;
+	$expandedsectionarray=array();
+	foreach($oldexpandedsectionarray as $sectioncursor)
+	{
+		// is_in_subtree(fulltree,sectionparent,sectionchild)
+		if ($sectioncursor && ! is_in_subtree($fulltree,$section,$sectioncursor)) $expandedsectionarray[]=$sectioncursor;
+	}
+	$_SESSION['dol_catexpandedsectionarray'.$type]=join(',',$expandedsectionarray);
+}
+//print $_SESSION['dol_catexpandedsectionarray'.$type].'<br>';
+
+$nbofentries=0;
+$oldvallevel=0;
+$var=true;
+foreach($fulltree as $key => $val)
+{
+	//$fullpathparent=preg_replace('/_[^_]+$/i','',$val['fullpath']);
+
+	// Define showline
+	$showline=0;
+
+	//var_dump($expandedsectionarray);
+
+	// If directory is son of expanded directory, we show line
+	if (isset($val['fk_parent']) && in_array($val['fk_parent'],$expandedsectionarray)) $showline=4;
+	// If directory is parent of selected directory or is selected directory, we show line
+	elseif (preg_match('/'.$val['fullpath'].'_/i',$fullpathselected.'_')) $showline=2;
+	// If we are level one we show line
+	elseif ($val['level'] < 2) $showline=1;
+	//print 'xxx '.$val['level'].' - '.$fullpathselected.' - '.$val['fullpath'].' - '.$val['fk_parent'].' showline='.$showline.'<br>'."\n";
+
+	if ($showline)
+	{
+        $var=!$var;
+
+	    if (in_array($val['id'],$expandedsectionarray)) $option='indexexpanded';
+		else $option='indexnotexpanded';
+		//print $option;
+
+        print "<tr ".$bc[$var].">";
+
+		// Show tree graph pictos
+		print '<td align="left">';
+		print '<table class="nobordernopadding"><tr class="nobordernopadding"><td>';
+		$resarray=tree_showpad($fulltree,$key);
+		$a=$resarray[0];
+		$nbofsubdir=$resarray[1];
+		$nboffilesinsubdir=$resarray[2];
+		print '</td>';
+
+		// Show picto
+		print '<td valign="top">';
+		//print $val['fullpath']."(".$showline.")";
+		$n='2';
+		if (! in_array($val['id'],$expandedsectionarray)) $n='3';
+		if (! in_array($val['id'],$expandedsectionarray)) $ref=img_picto('',DOL_URL_ROOT.'/theme/common/treemenu/plustop'.$n.'.gif','',1);
+		else $ref=img_picto('',DOL_URL_ROOT.'/theme/common/treemenu/minustop'.$n.'.gif','',1);
+		if ($option == 'indexexpanded') $lien = '<a href="'.$_SERVER["PHP_SELF"].'?section='.$val['id'].'&amp;type='.$type.'&amp;sectionexpand=false">';
+    	if ($option == 'indexnotexpanded') $lien = '<a href="'.$_SERVER["PHP_SELF"].'?section='.$val['id'].'&amp;type='.$type.'&amp;sectionexpand=true">';
+    	$newref=str_replace('_',' ',$ref);
+    	$lienfin='</a>';
+    	print $lien.$newref.$lienfin;
+		if (! in_array($val['id'],$expandedsectionarray)) print img_picto('','object_category');
+		else print img_picto('','object_category-expanded');
+		print '</td>';
+		// Show link
+		print '<td valign="middle">';
+		//if ($section == $val['id']) print ' <u>';
+		// We don't want a link ... why ?
+		$userstatic->id=$val['id'];
+		$userstatic->ref=$val['label'];
+		$userstatic->type=$type;
+		print ' &nbsp;'.$userstatic->getNomUrl(0,'',60);
+
+		//print ' &nbsp;'.dol_trunc($val['label'],28);
+		//if ($section == $val['id']) print '</u>';
+		print '</td>';
+		print '</tr></table>';
+		print "</td>\n";
+
+		// Description
+		print '<td>';
+		print dol_trunc($val['description'],48);
+		print '</td>';
+
+		// Link to category card
+		print '<td align="right"><a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$val['id'].'&type='.$type.'">'.img_view().'</a></td>';
+
+		// Add link
+		//print '<td align="right"><a href="'.DOL_URL_ROOT.'/ecm/docdir.php?action=create&amp;catParent='.$val['id'].'">'.img_edit_add().'</a></td>';
+		//print '<td align="right">&nbsp;</td>';
+
+		print "</tr>\n";
+	}
+
+	$oldvallevel=$val['level'];
+	$nbofentries++;
+}
+
+
+// If nothing to show
+if ($nbofentries == 0)
+{
+	print '<tr>';
+	print '<td class="left"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('','treemenu/branchbottom.gif').'</td>';
+	print '<td>'.img_picto('',DOL_URL_ROOT.'/theme/common/treemenu/minustop3.gif','',1).'</td>';
+	print '<td valign="middle">';
+	print $langs->trans("NoCategoryYet");
+	print '</td>';
+	print '<td>&nbsp;</td>';
+	print '</table></td>';
+	print '<td colspan="4">&nbsp;</td>';
+	print '</tr>';
+}
+
+// ----- End of section -----
+// --------------------------
+
+print "</table>";
+
+
+llxFooter();
+$db->close();
+?>

From bc505c98a0424a64dd7fb01ba3b2bb736e5cd41d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 19 Feb 2013 21:10:31 +0100
Subject: [PATCH 161/162] Test to avoid infinite loop

---
 htdocs/product/class/product.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index fc0c08e736f..c92b94b0b6e 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2321,7 +2321,7 @@ class Product extends CommonObject
 	}
 
 	/**
-	 *  Return childs of prodcut with if fk_parent
+	 *  Return childs of product with if fk_parent
 	 *
 	 * 	@param		int		$fk_parent	Id of product to search childs of
 	 *  @return     array       		Prod
@@ -2333,7 +2333,9 @@ class Product extends CommonObject
 		$sql.= ", ".MAIN_DB_PREFIX."product_association as pa";
 		$sql.= " WHERE p.rowid = pa.fk_product_fils";
 		$sql.= " AND pa.fk_product_pere = ".$fk_parent;
+		$sql.= " AND pa.fk_product_fils != ".$fk_parent;	// This should not happens, it is to avoid invinite loop if it happens
 
+		dol_syslog(get_class($this).'::getChildsArbo sql='.$sql);
 		$res  = $this->db->query($sql);
 		if ($res)
 		{

From 3c18696f7e0f37c296126135dea03152f6ee5dca Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 Feb 2013 10:37:52 +0100
Subject: [PATCH 162/162] Removed deprecated code

---
 htdocs/theme/amarok/style.css.php      | 105 ++---------------------
 htdocs/theme/auguria/style.css.php     | 110 +-----------------------
 htdocs/theme/bureau2crea/style.css.php | 112 +------------------------
 htdocs/theme/cameleo/style.css.php     | 112 +------------------------
 4 files changed, 16 insertions(+), 423 deletions(-)

diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index 1ab5f9a7570..d7efa19804d 100755
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -1446,7 +1446,7 @@ table.cal_month    { border-spacing: 0px; }
 .cal_current_month { border-top: 0; border-left: solid 1px #E0E0E0; border-right: 0; border-bottom: solid 1px #E0E0E0; }
 .cal_other_month   { border-top: 0; border-left: solid 1px #C0C0C0; border-right: 0; border-bottom: solid 1px #C0C0C0; }
 .cal_current_month_right { border-right: solid 1px #E0E0E0; }
-.cal_other_month_right   { border-right: solid 1px #C0C0C0; } 
+.cal_other_month_right   { border-right: solid 1px #C0C0C0; }
 
 .cal_other_month {
 	background:#dddddd;
@@ -1581,105 +1581,10 @@ form.inplaceeditor-form a {/* The cancel link */
 /* Admin Menu                                                                     */
 /* ============================================================================== */
 
-/* CSS à appliquer à l'arbre hierarchique */
-
-/* Lien plier / déplier tout */
-.arbre-switch {
-    text-align:right;
-    padding:0 5px;
-    margin:0 0 -18px 0;
-}
-
-/* Arbre */
-ul.arbre {padding:5px 10px;}
-
-/* strong:A modifier en fonction de la balise choisie */
-ul.arbre strong {
-    font-weight:normal;
-    padding:0 0 0 20px;
-    margin:0 0 0 -7px;
-    background-image:url(<?php echo DOL_URL_ROOT.'/theme/common/treemenu/branch.gif' ?>);
-    background-repeat:no-repeat;
-    background-position:1px 50%;
-}
-
-ul.arbre strong.arbre-plier {
-    background-image:url(<?php echo DOL_URL_ROOT.'/theme/common/treemenu/plus.gif' ?>);
-    cursor:pointer;
-}
-
-ul.arbre strong.arbre-deplier {
-    background-image:url(<?php echo DOL_URL_ROOT.'/theme/common/treemenu/minus.gif' ?>);
-    cursor:pointer;
-}
-
-ul.arbre ul {
-    padding:0;
-    margin:0;
-}
-
-ul.arbre li {
-    padding:0;
-    margin:0;
-    list-style:none;
-}
-
-/* This is to create an indent */
-ul.arbre li li {margin:0 0 0 16px;}
-
-/* Classe pour masquer */
-.hide {display:none;}
-
-img.menuNew {
-	display:block;
-	border:0px;
-}
-
-img.menuEdit {
-	border:0px;
-	display:block;
-}
-
-img.menuDel {
-	display:none;
-	border:0px;
-}
-
-div.menuNew {
-	margin-top:-20px;
-	margin-left:270px;
-	height:20px;
-	padding:0px;
-	width:30px;
-	position:relative;
-}
-
-div.menuEdit {
-	margin-top:-15px;
-	margin-left:250px;
-	height:20px;
-	padding:0px;
-	width:30px;
-	position:relative;
-}
-
-div.menuDel {
-	margin-top:-20px;
-	margin-left:290px;
-	height:20px;
-	padding:0px;
-	width:30px;
-	position:relative;
-}
-
-div.menuFleche {
-	margin-top:-16px;
-	margin-left:320px;
-	height:20px;
-	padding:0px;
-	width:30px;
-	position:relative;
-}
+/* CSS for treeview */
+.treeview ul { background-color: transparent !important; margin-top: 0; }
+.treeview li { background-color: transparent !important; padding: 0 0 0 16px !important; min-height: 20px; }
+.treeview .hover { color: black !important; }
 
 
 /* ============================================================================== */
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index 94a07d52ea8..3360cb07f69 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -1742,113 +1742,9 @@ li.cal_event       { border: none; list-style-type: none; }
 /* ============================================================================== */
 
 /* CSS for treeview */
-
-/* Lien plier /deplier tout */
-.arbre-switch {
-    text-align: right;
-    padding: 0 5px;
-    margin: 0 0 -18px 0;
-}
-
-/* Arbre */
-ul.arbre {
-    padding: 5px 10px;
-}
-/* strong : A modifier en fonction de la balise choisie */
-ul.arbre strong {
-    font-weight: normal;
-    padding: 0 0 0 20px;
-    margin: 0 0 0 -7px;
-    background-image: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/branch.gif',1); ?>);
-    background-repeat: no-repeat;
-    background-position: 1px 50%;
-}
-ul.arbre strong.arbre-plier {
-    background-image: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/plus.gif',1); ?>);
-    cursor: pointer;
-}
-ul.arbre strong.arbre-deplier {
-    background-image: url(<?php echo dol_buildpath($path.'/theme/common/treemenu/minus.gif',1); ?>);
-    cursor: pointer;
-}
-ul.arbre ul {
-    padding: 0;
-    margin: 0;
-}
-ul.arbre li {
-    padding: 0;
-    margin: 0;
-    list-style: none;
-}
-/* This is to create an indent */
-ul.arbre li li {
-    margin: 0 0 0 16px;
-}
-/* Classe pour masquer */
-.hide {
-    display: none;
-}
-
-img.menuNew
-{
-	display:block;
-	border:0px;
-}
-
-img.menuEdit
-{
-	border: 0px;
-	display: block;
-}
-
-img.menuDel
-{
-	display:none;
-	border: 0px;
-}
-
-div.menuNew
-{
-	margin-top:-20px;
-	margin-<?php print $left; ?>:270px;
-	height:20px;
-	padding:0px;
-	width:30px;
-	position:relative;
-}
-
-div.menuEdit
-{
-	margin-top:-15px;
-	margin-<?php print $left; ?>:250px;
-	height:20px;
-	padding:0px;
-	width:30px;
-	position:relative;
-
-}
-
-div.menuDel
-{
-	margin-top:-20px;
-	margin-<?php print $left; ?>:290px;
-	height:20px;
-	padding:0px;
-	width:30px;
-	position:relative;
-
-}
-
-div.menuFleche
-{
-	margin-top:-16px;
-	margin-<?php print $left; ?>:320px;
-	height:20px;
-	padding:0px;
-	width:30px;
-	position:relative;
-
-}
+.treeview ul { background-color: transparent !important; margin-top: 0; }
+.treeview li { background-color: transparent !important; padding: 0 0 0 16px !important; min-height: 20px; }
+.treeview .hover { color: black !important; }
 
 
 /* ============================================================================== */
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 0c7b980ca29..97527a537cd 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -1851,7 +1851,7 @@ table.cal_month    { border-spacing: 0px; }
 .cal_current_month { border-top: 0; border-left: solid 1px #E0E0E0; border-right: 0; border-bottom: solid 1px #E0E0E0; }
 .cal_other_month   { border-top: 0; border-left: solid 1px #C0C0C0; border-right: 0; border-bottom: solid 1px #C0C0C0; }
 .cal_current_month_right { border-right: solid 1px #E0E0E0; }
-.cal_other_month_right   { border-right: solid 1px #C0C0C0; } 
+.cal_other_month_right   { border-right: solid 1px #C0C0C0; }
 .cal_other_month   { background: #DDDDDD; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_past_month    { background: #EEEEEE; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_current_month { background: #FFFFFF; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
@@ -1908,113 +1908,9 @@ li.cal_event       { border: none; list-style-type: none; }
 /* ============================================================================== */
 
 /* CSS for treeview */
-
-/* Lien plier /deplier tout */
-.arbre-switch {
-    text-align: right;
-    padding: 0 5px;
-    margin: 0 0 -18px 0;
-}
-
-/* Arbre */
-ul.arbre {
-    padding: 5px 10px;
-}
-/* strong : A modifier en fonction de la balise choisie */
-ul.arbre strong {
-    font-weight: normal;
-    padding: 0 0 0 20px;
-    margin: 0 0 0 -7px;
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/common/treemenu/branch.gif' ?>);
-    background-repeat: no-repeat;
-    background-position: 1px 50%;
-}
-ul.arbre strong.arbre-plier {
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/common/treemenu/plus.gif' ?>);
-    cursor: pointer;
-}
-ul.arbre strong.arbre-deplier {
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/common/treemenu/minus.gif' ?>);
-    cursor: pointer;
-}
-ul.arbre ul {
-    padding: 0;
-    margin: 0;
-}
-ul.arbre li {
-    padding: 0;
-    margin: 0;
-    list-style: none;
-}
-/* This is to create an indent */
-ul.arbre li li {
-    margin: 0 0 0 16px;
-}
-/* Classe pour masquer */
-.hide {
-    display: none;
-}
-
-img.menuNew
-{
-	display:block;
-	border:0px;
-}
-
-img.menuEdit
-{
-	border: 0px;
-	display: block;
-}
-
-img.menuDel
-{
-	display:none;
-	border: 0px;
-}
-
-div.menuNew
-{
-	margin-top:-20px;
-	margin-<?php print $left; ?>:270px;
-	height:20px;
-	padding:0px;
-	width:30px;
-	position:relative;
-}
-
-div.menuEdit
-{
-	margin-top:-15px;
-	margin-<?php print $left; ?>:250px;
-	height:20px;
-	padding:0px;
-	width:30px;
-	position:relative;
-
-}
-
-div.menuDel
-{
-	margin-top:-20px;
-	margin-<?php print $left; ?>:290px;
-	height:20px;
-	padding:0px;
-	width:30px;
-	position:relative;
-
-}
-
-div.menuFleche
-{
-	margin-top:-16px;
-	margin-<?php print $left; ?>:320px;
-	height:20px;
-	padding:0px;
-	width:30px;
-	position:relative;
-
-}
+.treeview ul { background-color: transparent !important; margin-top: 0; }
+.treeview li { background-color: transparent !important; padding: 0 0 0 16px !important; min-height: 20px; }
+.treeview .hover { color: black !important; }
 
 
 /* ============================================================================== */
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index 03a862da42f..2dd4bfc3a2f 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -1785,7 +1785,7 @@ table.cal_month    { border-spacing: 0px; }
 .cal_current_month { border-top: 0; border-left: solid 1px #E0E0E0; border-right: 0; border-bottom: solid 1px #E0E0E0; }
 .cal_other_month   { border-top: 0; border-left: solid 1px #C0C0C0; border-right: 0; border-bottom: solid 1px #C0C0C0; }
 .cal_current_month_right { border-right: solid 1px #E0E0E0; }
-.cal_other_month_right   { border-right: solid 1px #C0C0C0; } 
+.cal_other_month_right   { border-right: solid 1px #C0C0C0; }
 .cal_other_month   { background: #DDDDDD; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_past_month    { background: #EEEEEE; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
 .cal_current_month { background: #FFFFFF; padding-<?php print $left; ?>: 2px; padding-<?php print $right; ?>: 1px; padding-top: 0px; padding-bottom: 0px; }
@@ -1863,113 +1863,9 @@ li.cal_event       { border: none; list-style-type: none; }
 /* ============================================================================== */
 
 /* CSS for treeview */
-
-/* Lien plier /deplier tout */
-.arbre-switch {
-    text-align: right;
-    padding: 0 5px;
-    margin: 0 0 -18px 0;
-}
-
-/* Arbre */
-ul.arbre {
-    padding: 5px 10px;
-}
-/* strong : A modifier en fonction de la balise choisie */
-ul.arbre strong {
-    font-weight: normal;
-    padding: 0 0 0 20px;
-    margin: 0 0 0 -7px;
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/common/treemenu/branch.gif' ?>);
-    background-repeat: no-repeat;
-    background-position: 1px 50%;
-}
-ul.arbre strong.arbre-plier {
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/common/treemenu/plus.gif' ?>);
-    cursor: pointer;
-}
-ul.arbre strong.arbre-deplier {
-    background-image: url(<?php echo DOL_URL_ROOT.'/theme/common/treemenu/minus.gif' ?>);
-    cursor: pointer;
-}
-ul.arbre ul {
-    padding: 0;
-    margin: 0;
-}
-ul.arbre li {
-    padding: 0;
-    margin: 0;
-    list-style: none;
-}
-/* This is to create an indent */
-ul.arbre li li {
-    margin: 0 0 0 16px;
-}
-/* Classe pour masquer */
-.hide {
-    display: none;
-}
-
-img.menuNew
-{
-	display:block;
-	border:0px;
-}
-
-img.menuEdit
-{
-	border: 0px;
-	display: block;
-}
-
-img.menuDel
-{
-	display:none;
-	border: 0px;
-}
-
-div.menuNew
-{
-	margin-top:-20px;
-	margin-<?php print $left; ?>:270px;
-	height:20px;
-	padding:0px;
-	width:30px;
-	position:relative;
-}
-
-div.menuEdit
-{
-	margin-top:-15px;
-	margin-<?php print $left; ?>:250px;
-	height:20px;
-	padding:0px;
-	width:30px;
-	position:relative;
-
-}
-
-div.menuDel
-{
-	margin-top:-20px;
-	margin-<?php print $left; ?>:290px;
-	height:20px;
-	padding:0px;
-	width:30px;
-	position:relative;
-
-}
-
-div.menuFleche
-{
-	margin-top:-16px;
-	margin-<?php print $left; ?>:320px;
-	height:20px;
-	padding:0px;
-	width:30px;
-	position:relative;
-
-}
+.treeview ul { background-color: transparent !important; margin-top: 0; }
+.treeview li { background-color: transparent !important; padding: 0 0 0 16px !important; min-height: 20px; }
+.treeview .hover { color: black !important; }
 
 
 /* ============================================================================== */