From 872fe157433f3efca2ccc35865c9c1be914be410 Mon Sep 17 00:00:00 2001
From: Drosis Nikos <drosis.nikos@gmail.com>
Date: Mon, 26 Jan 2015 17:05:47 +0200
Subject: [PATCH 01/93] Check live last version from sourceforge.net

---
 htdocs/admin/tools/update.php | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index 40683bdc747..cdf93a221e7 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -105,7 +105,30 @@ llxHeader('',$langs->trans("Upgrade"),$wikihelp);
 print_fiche_titre($langs->trans("Upgrade"),'','setup');
 
 print $langs->trans("CurrentVersion").' : <b>'.DOL_VERSION.'</b><br>';
-print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("FeatureNotYetAvailable").'</b><br>';
+if ($sfurl = simplexml_load_file('http://sourceforge.net/projects/dolibarr/rss')) {
+    $title=$sfurl->channel[0]->item[0]->title;
+function word_limiter( $text, $limit = 30, $chars = '0123456789.' ) {
+    if( strlen( $text ) > $limit ) {
+        $words = str_word_count( $text, 2, $chars );
+        $words = array_reverse( $words, TRUE );
+        foreach( $words as $length => $word ) {
+            if( $length + strlen( $word ) >= $limit ) {
+                array_shift( $words );
+            } else {
+                break;
+            }
+        }
+        $words = array_reverse( $words );
+        $text = implode( " ", $words ) . '';
+    }
+    return $text;
+}
+
+$str = $title;
+print $langs->trans("LastStableVersion").' : <b>'. word_limiter( $str ).'</b><br>';
+} else {
+    print $langs->trans("LastStableVersion").' : <b>' .('Update Server Off-Line').'</b><br>';
+}
 print '<br>';
 
 print $langs->trans("Upgrade").'<br>';

From fc7f2f2303fecd350ad2590efedb11379a53a375 Mon Sep 17 00:00:00 2001
From: Drosis Nikos <drosis.nikos@gmail.com>
Date: Wed, 28 Jan 2015 23:12:46 +0200
Subject: [PATCH 02/93] translate UpdateServerOffline

---
 htdocs/admin/tools/update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index cdf93a221e7..e12ef58cebf 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -127,7 +127,7 @@ function word_limiter( $text, $limit = 30, $chars = '0123456789.' ) {
 $str = $title;
 print $langs->trans("LastStableVersion").' : <b>'. word_limiter( $str ).'</b><br>';
 } else {
-    print $langs->trans("LastStableVersion").' : <b>' .('Update Server Off-Line').'</b><br>';
+    print $langs->trans("LastStableVersion").' : <b>' .$langs->trans("UpdateServerOffline").'</b><br>';
 }
 print '<br>';
 

From 733d2be39c1d45acfc7bbf3b7e3ffe81e05e7310 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 2 Feb 2015 11:13:11 +0100
Subject: [PATCH 03/93] readd index.html file

---
 htdocs/contrat/class/index.html | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 htdocs/contrat/class/index.html

diff --git a/htdocs/contrat/class/index.html b/htdocs/contrat/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d

From 2f59a63e5ad6f063e3a18c77e3c2c4b79f40bde9 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 2 Feb 2015 18:03:18 +0100
Subject: [PATCH 04/93] Fix bug on contract create form propal and fix
 extrafield must be control before create object

---
 htdocs/contrat/card.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index b2b99a9dde3..248a9a46115 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -73,7 +73,7 @@ $object = new Contrat($db);
 $extrafields = new ExtraFields($db);
 
 // Load object
-if ($id > 0 || ! empty($ref)) {
+if ($id > 0 || ! empty($ref) && $action!='add') {
 	$ret = $object->fetch($id, $ref);
 	if ($ret > 0)
 		$ret = $object->fetch_thirdparty();
@@ -203,6 +203,13 @@ if ($action == 'add' && $user->rights->contrat->creer)
 		$error++;
 	}
 
+	// Fill array 'array_options' with data from add form
+	$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+	if ($ret < 0) {
+		$error ++;
+		$action = 'create';
+	}
+
 	if (! $error)
 	{
 		$object->socid						= $socid;
@@ -352,10 +359,6 @@ if ($action == 'add' && $user->rights->contrat->creer)
 	    }
 	    else
 	    {
-
-	    	// Fill array 'array_options' with data from add form
-	    	$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
-
 	        $result = $object->create($user);
 	        if ($result > 0)
 	        {

From 7f5e4aa135da4b33b1571eaa91b7cff98617d5a5 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 11 Feb 2015 11:44:49 +0100
Subject: [PATCH 05/93] FIX : bug #1840 Email template modules in HTML are not
 render correctly

---
 htdocs/core/class/doleditor.class.php     | 10 ++++++----
 htdocs/core/class/html.formmail.class.php | 16 ++++++++++++++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 6dc726b084e..0433d7799c4 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -43,6 +43,7 @@ class DolEditor
 	var $height;
 	var $width;
 	var $readonly;
+	var $allowed_content;
 
 
     /**
@@ -62,8 +63,9 @@ class DolEditor
      *      @param  int		$rows                   Size of rows for textarea tool
 	 *      @param  int		$cols                   Size of cols for textarea tool (textarea number of cols or %)
 	 *      @param	int		$readonly				0=Read/Edit, 1=Read only
+	 *      @param	int		$allowed_content		0=filter input text, 1=render as it is
 	 */
-    function __construct($htmlname,$content,$width='',$height=200,$toolbarname='Basic',$toolbarlocation='In',$toolbarstartexpanded=false,$uselocalbrowser=true,$okforextendededitor=true,$rows=0,$cols=0,$readonly=0)
+    function __construct($htmlname,$content,$width='',$height=200,$toolbarname='Basic',$toolbarlocation='In',$toolbarstartexpanded=false,$uselocalbrowser=true,$okforextendededitor=true,$rows=0,$cols=0,$readonly=0,$allowed_content=0)
     {
     	global $conf,$langs;
 
@@ -132,6 +134,7 @@ class DolEditor
             $this->cols					= (preg_match('/%/',$cols)?$cols:max(40,$cols));	// If $cols is a percent, we keep it, otherwise, we take max
             $this->height				= $height;
             $this->width				= $width;
+            $this->allowed_content		= $allowed_content;
     	}
 
     }
@@ -163,16 +166,14 @@ class DolEditor
             $out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'"'.(preg_match('/%/',$this->cols)?' style="width: '.$this->cols.'"':' cols="'.$this->cols.'"').' class="flat">';
             $out.= $this->content;
             $out.= '</textarea>';
-
             if ($this->tool == 'ckeditor')
             {
             	if (! defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR','1');
 
             	//$skin='kama';
             	$skin='moono'; 	// default with cdeditor 4
-
+			
             	$htmlencode_force=preg_match('/_encoded$/',$this->toolbarname)?'true':'false';
-
             	$out.= '<script type="text/javascript">
             			$(document).ready(function () {
                             /* if (CKEDITOR.loadFullCore) CKEDITOR.loadFullCore(); */
@@ -181,6 +182,7 @@ class DolEditor
             					{
             						/* property:xxx is same than CKEDITOR.config.property = xxx */
             						customConfig : ckeditorConfig,
+                            		allowedContent :'.($this->allowed_content?'true':'false').',
             						readOnly : '.($this->readonly?'true':'false').',
                             		htmlEncodeOutput :'.$htmlencode_force.',
             						toolbar: \''.$this->toolbarname.'\',
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 308534f3ebf..f67d111e453 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -582,7 +582,12 @@ class FormMail
         	if (! empty($this->withbody))
         	{
         		$defaultmessage="";
-        		if (count($arraydefaultmessage) > 0 && $arraydefaultmessage['content']) $defaultmessage=$arraydefaultmessage['content'];
+        		$from_template=false;
+        		if (count($arraydefaultmessage) > 0 && $arraydefaultmessage['content']) {
+        			$defaultmessage=$arraydefaultmessage['content'];
+        			$from_template=true;
+        			
+        		}
         		elseif (! is_numeric($this->withbody))	$defaultmessage=$this->withbody;
 
         		// Complete substitution array
@@ -611,6 +616,13 @@ class FormMail
 					$this->substit['__SIGNATURE__'] = dol_nl2br($this->substit['__SIGNATURE__']);
 				} else if(!dol_textishtml($defaultmessage) && dol_textishtml($this->substit['__SIGNATURE__'])) {
 					$defaultmessage = dol_nl2br($defaultmessage);
+				} 
+
+				 if (dol_textishtml($defaultmessage) && $from_template) {
+					$allow_content=1;
+					var_dump($allow_content);
+				} else {
+					$allow_content=0;
 				}
 
 
@@ -643,7 +655,7 @@ class FormMail
 						else $this->withfckeditor=0;
         			}
 
-        			$doleditor=new DolEditor('message',$defaultmessage,'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,72);
+        			$doleditor=new DolEditor('message',$defaultmessage,'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,72,0,$allow_content);
         			$out.= $doleditor->Create(1);
         		}
         		$out.= "</td></tr>\n";

From 73f1d10b728a7271e5f24dc8f6647763310876a8 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 11 Feb 2015 11:46:29 +0100
Subject: [PATCH 06/93] syntax

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

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index f67d111e453..2c7cc0be7fe 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -586,9 +586,9 @@ class FormMail
         		if (count($arraydefaultmessage) > 0 && $arraydefaultmessage['content']) {
         			$defaultmessage=$arraydefaultmessage['content'];
         			$from_template=true;
-        			
+        		} elseif (! is_numeric($this->withbody)) {
+        			$defaultmessage=$this->withbody;
         		}
-        		elseif (! is_numeric($this->withbody))	$defaultmessage=$this->withbody;
 
         		// Complete substitution array
         		if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_ADD_PAYMENT_URL))

From db94860f76003ba8a5a04923b1f4028b7e830402 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 11 Feb 2015 11:47:12 +0100
Subject: [PATCH 07/93] syntax

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

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 2c7cc0be7fe..d4d4dcd3bb1 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -618,14 +618,12 @@ class FormMail
 					$defaultmessage = dol_nl2br($defaultmessage);
 				} 
 
-				 if (dol_textishtml($defaultmessage) && $from_template) {
+				if (dol_textishtml($defaultmessage) && $from_template) {
 					$allow_content=1;
-					var_dump($allow_content);
 				} else {
 					$allow_content=0;
 				}
 
-
         		if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
 				else
 				{

From db2dee7c03435e9e04ece8466046904555afccf4 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 11 Feb 2015 11:48:11 +0100
Subject: [PATCH 08/93] syntax

---
 htdocs/core/class/doleditor.class.php     | 2 +-
 htdocs/core/class/html.formmail.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 0433d7799c4..2bdfb33f727 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -172,7 +172,7 @@ class DolEditor
 
             	//$skin='kama';
             	$skin='moono'; 	// default with cdeditor 4
-			
+
             	$htmlencode_force=preg_match('/_encoded$/',$this->toolbarname)?'true':'false';
             	$out.= '<script type="text/javascript">
             			$(document).ready(function () {
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index d4d4dcd3bb1..02c361e98d7 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -616,7 +616,7 @@ class FormMail
 					$this->substit['__SIGNATURE__'] = dol_nl2br($this->substit['__SIGNATURE__']);
 				} else if(!dol_textishtml($defaultmessage) && dol_textishtml($this->substit['__SIGNATURE__'])) {
 					$defaultmessage = dol_nl2br($defaultmessage);
-				} 
+				}
 
 				if (dol_textishtml($defaultmessage) && $from_template) {
 					$allow_content=1;

From e9bfa71556ca3f0eef000bd6487812c25bbc944f Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 11 Feb 2015 11:49:06 +0100
Subject: [PATCH 09/93] syntax

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

diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 2bdfb33f727..f748af42614 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -166,6 +166,7 @@ class DolEditor
             $out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'"'.(preg_match('/%/',$this->cols)?' style="width: '.$this->cols.'"':' cols="'.$this->cols.'"').' class="flat">';
             $out.= $this->content;
             $out.= '</textarea>';
+
             if ($this->tool == 'ckeditor')
             {
             	if (! defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR','1');
@@ -174,6 +175,7 @@ class DolEditor
             	$skin='moono'; 	// default with cdeditor 4
 
             	$htmlencode_force=preg_match('/_encoded$/',$this->toolbarname)?'true':'false';
+
             	$out.= '<script type="text/javascript">
             			$(document).ready(function () {
                             /* if (CKEDITOR.loadFullCore) CKEDITOR.loadFullCore(); */

From 504cc890784cc9f4ac2dfd4cf4a73cf2e5ba8e89 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 20 Feb 2015 09:24:33 +0100
Subject: [PATCH 10/93] New : replenish function adds new lines into already
 existing draft supplier order instead of creating a new supplier order

---
 htdocs/product/stock/replenish.php | 66 +++++++++++++++++++++++-------
 1 file changed, 51 insertions(+), 15 deletions(-)

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 35835709ab8..6bcabecbe9d 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -148,22 +148,58 @@ if ($action == 'order' && isset($_POST['valid']))
         foreach ($suppliers as $supplier)
         {
             $order = new CommandeFournisseur($db);
-            $order->socid = $suppliersid[$i];
-            //trick to know which orders have been generated this way
-            $order->source = 42;
-            foreach ($supplier['lines'] as $line) {
-                $order->lines[] = $line;
+            // Check if an order for the supplier exists
+            $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande_fournisseur";
+            $sql.= " WHERE fk_soc = ".$suppliersid[$i];
+            $sql.= " AND source = 42 AND fk_statut = 0";
+            $sql.= " ORDER BY date_creation DESC";
+            $resql = $db->query($sql);
+            if($resql && $db->num_rows($resql) > 0) {
+                $obj = $db->fetch_object($resql);
+                $order->fetch($obj->rowid);
+                foreach ($supplier['lines'] as $line) {
+                    $result = $order->addline(
+                        $line->desc,
+                        $line->subprice,
+                        $line->qty,
+                        $line->tva_tx,
+                        $line->localtax1_tx,
+                        $line->localtax2_tx,
+                        $line->fk_product,
+                        0,
+                        $line->ref_fourn,
+                        $line->remise_percent,
+                        'HT',
+                        0,
+                        $line->info_bits
+                    );
+                }
+                if ($result < 0) {
+                    $fail++;
+                    $msg = $langs->trans('OrderFail') . "&nbsp;:&nbsp;";
+                    $msg .= $order->error;
+                    setEventMessage($msg, 'errors');
+                } else {
+                    $id = $result;
+                }
+            } else {
+                $order->socid = $suppliersid[$i];
+                //trick to know which orders have been generated this way
+                $order->source = 42;
+                foreach ($supplier['lines'] as $line) {
+                    $order->lines[] = $line;
+                }
+                $order->cond_reglement_id = 0;
+                $order->mode_reglement_id = 0;
+                $id = $order->create($user);
+                if ($id < 0) {
+                    $fail++;
+                    $msg = $langs->trans('OrderFail') . "&nbsp;:&nbsp;";
+                    $msg .= $order->error;
+                    setEventMessage($msg, 'errors');
+                }
+                $i++;
             }
-            $order->cond_reglement_id = 0;
-            $order->mode_reglement_id = 0;
-            $id = $order->create($user);
-            if ($id < 0) {
-                $fail++;
-                $msg = $langs->trans('OrderFail') . "&nbsp;:&nbsp;";
-                $msg .= $order->error;
-                setEventMessage($msg, 'errors');
-            }
-            $i++;
         }
 
         if (! $fail && $id)

From 2547d96ffd7e88ded871cb22420585f8b84de9eb Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Fri, 20 Feb 2015 09:26:53 +0100
Subject: [PATCH 11/93] New : Use supplier default payment terms when creating
 a replenish order

---
 htdocs/product/stock/replenish.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 6bcabecbe9d..3c8f3746c45 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -184,13 +184,14 @@ if ($action == 'order' && isset($_POST['valid']))
                 }
             } else {
                 $order->socid = $suppliersid[$i];
+                $order->fetch_thirdparty();
                 //trick to know which orders have been generated this way
                 $order->source = 42;
                 foreach ($supplier['lines'] as $line) {
                     $order->lines[] = $line;
                 }
-                $order->cond_reglement_id = 0;
-                $order->mode_reglement_id = 0;
+                $order->cond_reglement_id = $order->thirdparty->cond_reglement_supplier_id;
+                $order->mode_reglement_id = $order->thirdparty->mode_reglement_supplier_id;
                 $id = $order->create($user);
                 if ($id < 0) {
                     $fail++;

From 207fa671b10e4458670674d2df88bc0badd676c1 Mon Sep 17 00:00:00 2001
From: guillaume <guillaume@lestanville.eu>
Date: Wed, 25 Feb 2015 09:04:11 +0100
Subject: [PATCH 12/93] Mise en place de l'initialisation de la base avec PDO
 SQlite

---
 .gitattributes                                | 66 +++++++--------
 INSTALL                                       | 12 +--
 htdocs/conf/phpinfo.php                       |  5 ++
 htdocs/core/db/sqlite.class.php               | 83 +++++++++++++++++--
 htdocs/core/modules/DolibarrModules.class.php |  2 +-
 htdocs/install/etape2.php                     |  3 +
 htdocs/install/fileconf.php                   |  2 +-
 htdocs/install/sqlite/functions/functions.sql |  0
 htdocs/install/sqlite/index.html              |  0
 index.php                                     |  2 +
 10 files changed, 127 insertions(+), 48 deletions(-)
 create mode 100644 htdocs/conf/phpinfo.php
 create mode 100644 htdocs/install/sqlite/functions/functions.sql
 create mode 100644 htdocs/install/sqlite/index.html
 create mode 100644 index.php

diff --git a/.gitattributes b/.gitattributes
index c5785ace780..0bea828e011 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,33 +1,33 @@
-# Set default behaviour, in case users don't have core.autocrlf set.
-# More info: https://help.github.com/articles/dealing-with-line-endings
-* text=auto
-
-
-# Explicitly declare text files we want to always be normalized and converted 
-# to native line endings on checkout.
-*.php text eol=lf
-*.pl text eol=lf
-*.sql text eol=lf
-*.htm text eol=lf
-*.html text eol=lf
-*.js text eol=lf
-*.css text eol=lf
-*.lang text eol=lf
-*.txt text eol=lf
-*.md text eol=lf
-*.pp text eol=lf
-*.sh text eol=lf
-*.yaml text eol=lf
-
-.bash_aliases text eol=lf
-
-# Denote all files that are truly binary and should not be modified.
-*.bmp binary
-*.ico binary
-*.png binary
-*.jpg binary
-*.odt binary
-*.odf binary
-*.frm binary
-*.MYD binary
-*.MYI binary
+# Set default behaviour, in case users don't have core.autocrlf set.
+# More info: https://help.github.com/articles/dealing-with-line-endings
+* text=auto
+
+
+# Explicitly declare text files we want to always be normalized and converted 
+# to native line endings on checkout.
+*.php text eol=lf
+*.pl text eol=lf
+*.sql text eol=lf
+*.htm text eol=lf
+*.html text eol=lf
+*.js text eol=lf
+*.css text eol=lf
+*.lang text eol=lf
+*.txt text eol=lf
+*.md text eol=lf
+*.pp text eol=lf
+*.sh text eol=lf
+*.yaml text eol=lf
+
+.bash_aliases text eol=lf
+
+# Denote all files that are truly binary and should not be modified.
+*.bmp binary
+*.ico binary
+*.png binary
+*.jpg binary
+*.odt binary
+*.odf binary
+*.frm binary
+*.MYD binary
+*.MYI binary
diff --git a/INSTALL b/INSTALL
index 584c3f04713..9f2fb214281 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
-INSTALL
--------
-
-English:     See README.md file.
-
-French:      Voir fichier README-FR.md.
+INSTALL
+-------
+
+English:     See README.md file.
+
+French:      Voir fichier README-FR.md.
diff --git a/htdocs/conf/phpinfo.php b/htdocs/conf/phpinfo.php
new file mode 100644
index 00000000000..179bd651458
--- /dev/null
+++ b/htdocs/conf/phpinfo.php
@@ -0,0 +1,5 @@
+<a href="index.php">Go back to index</a>
+| <a href="<?php echo $_SERVER["REQUEST_URI"];?>">Refresh</a>
+<br><br>
+
+<?php phpinfo(); ?>
\ No newline at end of file
diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php
index b16114a773f..786bf435fcf 100644
--- a/htdocs/core/db/sqlite.class.php
+++ b/htdocs/core/db/sqlite.class.php
@@ -40,6 +40,12 @@ class DoliDBSqlite extends DoliDB
 	//! Resultset of last query
 	private $_results;
 
+	/**
+	 * Indique que les fonctions personnalisées sont définies
+	 * @var boolean
+	 */
+	private static $customFunctionsDefined = false;
+
     /**
 	 *	Constructor.
 	 *	This create an opened connexion to a database server and eventually to a database
@@ -153,7 +159,7 @@ class DoliDBSqlite extends DoliDB
 
     			// Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
     			if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i',$line,$reg)) {
-    				$newline=preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i','\\1 \\2 SERIAL PRIMARY KEY',$line);
+    				$newline=preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i','\\1 \\2 integer PRIMARY KEY AUTOINCREMENT',$line);
                     //$line = "-- ".$line." replaced by --\n".$newline;
                     $line=$newline;
     			}
@@ -242,10 +248,17 @@ class DoliDBSqlite extends DoliDB
     				$line = "-- ".$line." replaced by --\n";
     				$line.= "CREATE ".(preg_match('/UNIQUE/',$reg[2])?'UNIQUE ':'')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
     			}
-            }
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i',$line, $reg)) {
+					// Pour l'instant les contraintes ne sont pas créées
+					dol_syslog(get_class().'::query line emptied');
+					$line = 'SELECT 0;';
 
-            // To have postgresql case sensitive
-            $line=str_replace(' LIKE \'',' ILIKE \'',$line);
+				}
+
+				//if (preg_match('/rowid\s+.*\s+PRIMARY\s+KEY,/i', $line)) {
+					//preg_replace('/(rowid\s+.*\s+PRIMARY\s+KEY\s*,)/i', '/* \\1 */', $line);
+				//}
+            }
 
 			// Delete using criteria on other table must not declare twice the deleted table
 			// DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable
@@ -387,7 +400,53 @@ class DoliDBSqlite extends DoliDB
         $this->error = 0;
 
 		// Convert MySQL syntax to SQLite syntax
-		$query=$this->convertSQLFromMysql($query,$type);
+		if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i',$query, $reg)) {
+			// Ajout d'une clef étrangère à la table
+			// procédure de remplacement de la table pour ajouter la contrainte
+			// Exemple : ALTER TABLE llx_adherent ADD CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid)
+			// -> CREATE TABLE ( ... ,CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid))
+			$foreignFields = $reg[5];
+			$foreignTable = $reg[4];
+			$localfields = $reg[3];
+			$constraintname=trim($reg[2]);
+			$tablename=trim($reg[1]);
+
+			$res = $this->db->query("SELECT sql FROM sqlite_master WHERE name='" . $tablename . "'");
+			$descTable = $res->fetchColumn();
+			$res->closeCursor();
+
+			// 1- Renommer la table avec un nom temporaire
+			$res = $this->query('ALTER TABLE ' . $tablename . ' RENAME TO tmp_' . $tablename);
+			$res->closeCursor();
+
+			// 2- Recréer la table avec la contrainte ajoutée
+
+			// on bricole la requete pour ajouter la contrainte
+			$descTable = substr($descTable, 0, strlen($descTable) - 1);
+			$descTable .= ", CONSTRAINT " . $constraintname . " FOREIGN KEY (" . $localfields . ") REFERENCES " .$foreignTable . "(" . $foreignFields . ")";
+
+			// fermeture de l'instruction
+			$descTable .= ')';
+
+			// Création proprement dite de la table
+			$res = $this->query($descTable);
+			$res->closeCursor();
+
+			// 3- Transférer les données
+			$res = $this->query('INSERT INTO ' . $tablename . ' SELECT * FROM tmp_' . $tablename);
+			$res->closeCursor();
+
+
+			// 4- Supprimer la table temporaire
+			$res = $this->query('DROP TABLE tmp_' . $tablename);
+			$res->closeCursor();
+
+			// dummy statement
+			$query="SELECT 0";
+
+		} else {
+			$query=$this->convertSQLFromMysql($query,$type);
+		}
 		//print "After convertSQLFromMysql:\n".$query."<br>\n";
 
 	    dol_syslog('sql='.$query, LOG_DEBUG);
@@ -487,7 +546,11 @@ class DoliDBSqlite extends DoliDB
     {
         // If resultset not provided, we take the last used by connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
-        return $resultset->rowCount();
+		if (preg_match("/^SELECT/i", $resultset->queryString)) {
+			$res = $this->db->query("SELECT count(*) FROM (" . $resultset->queryString . ") q");
+			return $res->fetchColumn();
+		}
+		return $resultset->rowCount();
     }
 
     /**
@@ -529,7 +592,12 @@ class DoliDBSqlite extends DoliDB
 	 */
     function escape($stringtoencode)
     {
-        return $this->db->quote($stringtoencode);
+		$ret = $this->db->quote($stringtoencode);
+		$l = strlen($ret);
+		if ($l >= 2) {
+			return substr($ret, 1, $l -2);
+		}
+		return '';
     }
 
     /**
@@ -1135,5 +1203,6 @@ class DoliDBSqlite extends DoliDB
 
         return $result;
     }
+
 }
 
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 17b8b8e8def..0b0ceb5460c 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1012,7 +1012,7 @@ abstract class DolibarrModules
         if ($resql)
         {
             $obj=$this->db->fetch_object($resql);
-            if (! empty($obj->value) && ! empty($this->rights))
+            if ($obj !== null && ! empty($obj->value) && ! empty($this->rights))
             {
                 // Si module actif
                 foreach ($this->rights as $key => $value)
diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php
index 1f6c5244d84..d934f79f0af 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/etape2.php
@@ -51,6 +51,8 @@ if ($dolibarr_main_db_type == "mysql")  $choix=1;
 if ($dolibarr_main_db_type == "mysqli") $choix=1;
 if ($dolibarr_main_db_type == "pgsql")  $choix=2;
 if ($dolibarr_main_db_type == "mssql")  $choix=3;
+if ($dolibarr_main_db_type == "sqlite")  $choix=4;
+
 //if (empty($choix)) dol_print_error('','Database type '.$dolibarr_main_db_type.' not supported into etape2.php page');
 
 // Now we load forced value from install.forced.php file.
@@ -411,6 +413,7 @@ if ($action == "set")
         if ($choix==1) $dir = "mysql/functions/";
         elseif ($choix==2) $dir = "pgsql/functions/";
         elseif ($choix==3) $dir = "mssql/functions/";
+		elseif ($choix==4) { $dir = "sqlite/functions/"; }
 
         // Creation donnees
         $file = "functions.sql";
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 2c6a5730100..49b80eb1b6b 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -306,7 +306,7 @@ if (! empty($force_install_message))
                     $class='DoliDB'.ucfirst($type);
                     include_once $dir."/".$file;
 
-                    if ($type == 'sqlite') continue;    // We hide sqlite because support can't be complete unti sqlit does not manage foreign key creation after table creation
+                    //if ($type == 'sqlite') continue;    // We hide sqlite because support can't be complete unti sqlit does not manage foreign key creation after table creation
 
 		            // Version min of database
                     $versionbasemin=explode('.',$class::VERSIONMIN);
diff --git a/htdocs/install/sqlite/functions/functions.sql b/htdocs/install/sqlite/functions/functions.sql
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/install/sqlite/index.html b/htdocs/install/sqlite/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/index.php b/index.php
new file mode 100644
index 00000000000..c59480bf4de
--- /dev/null
+++ b/index.php
@@ -0,0 +1,2 @@
+<?php
+	header('Location: htdocs');
\ No newline at end of file

From 24b069fcb0e6933b62976831cf959a22bc04ff08 Mon Sep 17 00:00:00 2001
From: guillaume <guillaume@lestanville.eu>
Date: Wed, 25 Feb 2015 14:31:41 +0100
Subject: [PATCH 13/93] =?UTF-8?q?Utilisation=20de=20la=20librairie=20Sqlit?=
 =?UTF-8?q?e3=20et=20cr=C3=A9ation=20de=20fonctions=20personnalis=C3=A9es?=
 =?UTF-8?q?=20pour=20la=20compatibilit=C3=A9=20avec=20MySQL.=20Certains=20?=
 =?UTF-8?q?formats=20de=20date=20ne=20sont=20pas=20compl=C3=A8tement=20pri?=
 =?UTF-8?q?s=20en=20compte.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/core/db/sqlite.class.php | 168 +++++++++++++++++++++++---------
 1 file changed, 124 insertions(+), 44 deletions(-)

diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php
index 786bf435fcf..d1a114a3330 100644
--- a/htdocs/core/db/sqlite.class.php
+++ b/htdocs/core/db/sqlite.class.php
@@ -34,18 +34,12 @@ class DoliDBSqlite extends DoliDB
     //! Database type
     public $type='sqlite';
     //! Database label
-    const LABEL='PDO Sqlite';
+    const LABEL='Sqlite3';
     //! Version min database
     const VERSIONMIN='3.0.0';
 	//! Resultset of last query
 	private $_results;
 
-	/**
-	 * Indique que les fonctions personnalisées sont définies
-	 * @var boolean
-	 */
-	private static $customFunctionsDefined = false;
-
     /**
 	 *	Constructor.
 	 *	This create an opened connexion to a database server and eventually to a database
@@ -102,7 +96,10 @@ class DoliDBSqlite extends DoliDB
             $this->database_selected = 1;
             $this->database_name = $name;
 
-            $this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+			$this->addCustomFunction('IF');
+			$this->addCustomFunction('MONTH');
+			$this->addCustomFunction('date_format');
+            //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         }
         else
         {
@@ -322,14 +319,16 @@ class DoliDBSqlite extends DoliDB
         if (empty($dir)) $dir=DOL_DATA_ROOT;
         // With sqlite, port must be in connect parameters
         //if (! $newport) $newport=3306;
+		$database_name = $dir.'/database_'.$name.'.sdb';
         try {
             /*** connect to SQLite database ***/
-            $this->db = new PDO("sqlite:".$dir.'/database_'.$name.'.sdb');
-            $this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+            //$this->db = new PDO("sqlite:".$dir.'/database_'.$name.'.sdb');
+			$this->db = new SQLite3($database_name);
+            //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         }
-        catch(PDOException $e)
+        catch(Exception $e)
         {
-            $this->error='PDO SQLITE '.$e->getMessage().' current dir='.$dir.'/database_'.$name.'.sdb';
+            $this->error=  self::LABEL.' '.$e->getMessage().' current dir='.$database_name;
             return '';
         }
 
@@ -345,9 +344,7 @@ class DoliDBSqlite extends DoliDB
      */
     function getVersion()
     {
-        $resql=$this->query('SELECT sqlite_version() as sqliteversion');
-        $row=$this->fetch_row($resql);
-        return $row[0];
+		return $this->db->version();
     }
 
     /**
@@ -376,6 +373,7 @@ class DoliDBSqlite extends DoliDB
         {
 	        if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
             $this->connected=0;
+			$this->db->close();
             $this->db=null;    // Clean this->db
             return true;
         }
@@ -411,13 +409,10 @@ class DoliDBSqlite extends DoliDB
 			$constraintname=trim($reg[2]);
 			$tablename=trim($reg[1]);
 
-			$res = $this->db->query("SELECT sql FROM sqlite_master WHERE name='" . $tablename . "'");
-			$descTable = $res->fetchColumn();
-			$res->closeCursor();
+			$descTable = $this->db->querySingle("SELECT sql FROM sqlite_master WHERE name='" . $tablename . "'");
 
 			// 1- Renommer la table avec un nom temporaire
-			$res = $this->query('ALTER TABLE ' . $tablename . ' RENAME TO tmp_' . $tablename);
-			$res->closeCursor();
+			$this->query('ALTER TABLE ' . $tablename . ' RENAME TO tmp_' . $tablename);
 
 			// 2- Recréer la table avec la contrainte ajoutée
 
@@ -429,17 +424,13 @@ class DoliDBSqlite extends DoliDB
 			$descTable .= ')';
 
 			// Création proprement dite de la table
-			$res = $this->query($descTable);
-			$res->closeCursor();
+			$this->query($descTable);
 
 			// 3- Transférer les données
-			$res = $this->query('INSERT INTO ' . $tablename . ' SELECT * FROM tmp_' . $tablename);
-			$res->closeCursor();
-
+			$this->query('INSERT INTO ' . $tablename . ' SELECT * FROM tmp_' . $tablename);
 
 			// 4- Supprimer la table temporaire
-			$res = $this->query('DROP TABLE tmp_' . $tablename);
-			$res->closeCursor();
+			$this->query('DROP TABLE tmp_' . $tablename);
 
 			// dummy statement
 			$query="SELECT 0";
@@ -455,8 +446,9 @@ class DoliDBSqlite extends DoliDB
         try {
             //$ret = $this->db->exec($query);
             $ret = $this->db->query($query);        // $ret is a PDO object
+			$ret->queryString = $query;
         }
-        catch(PDOException $e)
+        catch(Exception $e)
         {
             $this->error=$e->getMessage();
         }
@@ -497,7 +489,11 @@ class DoliDBSqlite extends DoliDB
     {
         // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
-        return $resultset->fetch(PDO::FETCH_OBJ);
+        //return $resultset->fetch(PDO::FETCH_OBJ);
+		$ret = $resultset->fetchArray(SQLITE3_ASSOC);
+		if ($ret) {
+			return (object)$ret;
+		}
     }
 
 
@@ -511,7 +507,11 @@ class DoliDBSqlite extends DoliDB
     {
         // If resultset not provided, we take the last used by connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
-        return $resultset->fetch(PDO::FETCH_ASSOC);
+        //return $resultset->fetch(PDO::FETCH_ASSOC);
+		$ret = $resultset->fetchArray(SQLITE3_ASSOC);
+		if ($ret) {
+			return (array)$ret;
+		}
     }
 
     /**
@@ -526,7 +526,7 @@ class DoliDBSqlite extends DoliDB
         if (! is_bool($resultset))
         {
             if (! is_object($resultset)) { $resultset=$this->_results; }
-            return $resultset->fetch(PDO::FETCH_NUM);
+            return $resultset->fetchArray(SQLITE3_NUM);
         }
         else
         {
@@ -547,10 +547,9 @@ class DoliDBSqlite extends DoliDB
         // If resultset not provided, we take the last used by connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
 		if (preg_match("/^SELECT/i", $resultset->queryString)) {
-			$res = $this->db->query("SELECT count(*) FROM (" . $resultset->queryString . ") q");
-			return $res->fetchColumn();
+			return $this->db->querySingle("SELECT count(*) FROM (" . $resultset->queryString . ") q");
 		}
-		return $resultset->rowCount();
+		return 0;
     }
 
     /**
@@ -564,9 +563,12 @@ class DoliDBSqlite extends DoliDB
     {
         // If resultset not provided, we take the last used by connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
+		if (preg_match("/^SELECT/i", $resultset->queryString)) {
+			return $this->num_rows($resultset);
+		}
         // mysql necessite un link de base pour cette fonction contrairement
         // a pqsql qui prend un resultset
-        return $resultset->rowCount();
+        return $this->db->changes();
     }
 
 
@@ -581,7 +583,7 @@ class DoliDBSqlite extends DoliDB
         // If resultset not provided, we take the last used by connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
         // Si resultset en est un, on libere la memoire
-        if (is_object($resultset)) $resultset->closeCursor();
+        if ($resultset && is_object($resultset)) $resultset->finalize();
     }
 
 	/**
@@ -592,12 +594,7 @@ class DoliDBSqlite extends DoliDB
 	 */
     function escape($stringtoencode)
     {
-		$ret = $this->db->quote($stringtoencode);
-		$l = strlen($ret);
-		if ($l >= 2) {
-			return substr($ret, 1, $l -2);
-		}
-		return '';
+		return Sqlite3::escapeString($stringtoencode);
     }
 
     /**
@@ -645,7 +642,7 @@ class DoliDBSqlite extends DoliDB
             {
                 return $errorcode_map[$this->db->errorCode()];
             }*/
-            $errno=$this->db->errorCode();
+            $errno=$this->db->lastErrorCode();
 			if ($errno=='HY000')
 			{
                 if (preg_match('/table.*already exists/i',$this->error))     return 'DB_ERROR_TABLE_ALREADY_EXISTS';
@@ -687,7 +684,7 @@ class DoliDBSqlite extends DoliDB
      */
     function last_insert_id($tab,$fieldid='rowid')
     {
-        return $this->db->lastInsertId();
+        return $this->db->lastInsertRowId();
     }
 
     /**
@@ -1204,5 +1201,88 @@ class DoliDBSqlite extends DoliDB
         return $result;
     }
 
+	private function addCustomFunction($name) {
+		if ($this->db) {
+			$localname = __CLASS__ . '::' . 'db_' . $name;
+			$reflectClass = new ReflectionClass(__CLASS__);
+			$reflectFunction = $reflectClass->getMethod('db_' . $name);
+			$arg_count = $reflectFunction->getNumberOfParameters();
+			if (!$this->db->createFunction($name, $localname , $arg_count)) {
+				$this->error = "unable to create custom function '$name'";
+			}
+		}
+		return 0;
+	}
+
+	public static function db_MONTH($date) {
+		return date('n', strtotime($date));
+	}
+
+	public static function db_date_format($date, $format) {
+		static $mysql_replacement;
+		if (! isset($mysql_replacement)) {
+			$mysql_replacement = array(
+				'%' => '%',
+				'a' => 'D',
+				'b' => 'M',
+				'c' => 'n',
+				'D' => 'jS',
+				'd' => 'd',
+				'e' => 'j',
+				'f' => 'u',
+				'H' => 'H',
+				'h' => 'h',
+				'I' => 'h',
+				'i' => 'i',
+				'j' => 'z',
+				'k' => 'H',
+				'l' => 'g',
+				'M' => 'F',
+				'm' => 'm',
+				'p' => 'A',
+				'r' => 'h:i:sA',
+				'S' => 's',
+				's' => 's',
+				'T' => 'H:i:s',
+				'U' => '',	//?
+				'u' => '',	//?
+				'V' => '',	//?
+				'v' => '',	//?
+				'W' => 'l',
+				'w' => 'w',
+				'X' => '',	//?
+				'x' => '',	//?
+				'Y' => 'Y',
+				'y' => 'y',
+			);
+		}
+
+		$fmt = '';
+		$lg = strlen($format);
+		$state = 0;
+		for($idx = 0; $idx < $lg; ++$idx) {
+			$char = $format[$idx];
+			if ($state == 0) {
+				if ($char == '%') {
+					$state = 1;
+				} else {
+					$fmt .= $char;
+				}
+			}
+			elseif ($state == 1) {
+				if (array_key_exists($char, $mysql_replacement)) {
+					$fmt .= $mysql_replacement[$char];
+				} else {
+					$fmt .= $char;
+				}
+				$state = 0;
+			}
+		}
+		return date($fmt, strtotime($date));
+	}
+
+	public static function db_IF($test, $true_part, $false_part) {
+		return ( $test ) ? $true_part : $false_part;
+	}
 }
 

From 9839420a6870f9c0fed0675528a20f171a8fd182 Mon Sep 17 00:00:00 2001
From: guillaume <guillaume@lestanville.eu>
Date: Wed, 25 Feb 2015 15:44:06 +0100
Subject: [PATCH 14/93] Correction de la gestion d'erreur.

---
 htdocs/core/db/sqlite.class.php | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php
index d1a114a3330..6a2f8ca955c 100644
--- a/htdocs/core/db/sqlite.class.php
+++ b/htdocs/core/db/sqlite.class.php
@@ -344,7 +344,7 @@ class DoliDBSqlite extends DoliDB
      */
     function getVersion()
     {
-		return $this->db->version();
+		return $this->db->version()['versionString'];
     }
 
     /**
@@ -446,7 +446,9 @@ class DoliDBSqlite extends DoliDB
         try {
             //$ret = $this->db->exec($query);
             $ret = $this->db->query($query);        // $ret is a PDO object
-			$ret->queryString = $query;
+			if ($ret) {
+				$ret->queryString = $query;
+			}
         }
         catch(Exception $e)
         {
@@ -1201,6 +1203,12 @@ class DoliDBSqlite extends DoliDB
         return $result;
     }
 
+	/**
+	 * Permet le chargement d'une fonction personnalisee dans le moteur de base de donnees.
+	 * Note: le nom de la fonction personnalisee est prefixee par 'db_'. La fonction doit être
+	 * statique et publique. Le nombre de parametres est determine automatiquement.
+	 * @param string $name Le nom de la fonction a definir dans Sqlite
+	 */
 	private function addCustomFunction($name) {
 		if ($this->db) {
 			$localname = __CLASS__ . '::' . 'db_' . $name;
@@ -1211,13 +1219,24 @@ class DoliDBSqlite extends DoliDB
 				$this->error = "unable to create custom function '$name'";
 			}
 		}
-		return 0;
 	}
 
+	/**
+	 * Cette fonction est l'equivalent de la fonction MONTH de MySql.
+	 * @param string $date
+	 * @return integer
+	 */
 	public static function db_MONTH($date) {
 		return date('n', strtotime($date));
 	}
 
+	/**
+	 * Cette fonction est l'equivelent de la fonction date_format de MySQL.
+	 * @staticvar string $mysql_replacement	Les symboles formatage a remplacer
+	 * @param string $date la date dans un format ISO
+	 * @param string $format la chaine de formatage
+	 * @return string La date formatee.
+	 */
 	public static function db_date_format($date, $format) {
 		static $mysql_replacement;
 		if (! isset($mysql_replacement)) {
@@ -1281,6 +1300,13 @@ class DoliDBSqlite extends DoliDB
 		return date($fmt, strtotime($date));
 	}
 
+	/**
+	 * Equivalent de la fonction MySQL IF
+	 * @param boolean $test Le resultat du test
+	 * @param mixed $true_part Partie a retourner si vrai
+	 * @param mixed $false_part Partie a retourner si faux
+	 * @return mixed Partie selectionnee en fonction du test
+	 */
 	public static function db_IF($test, $true_part, $false_part) {
 		return ( $test ) ? $true_part : $false_part;
 	}

From 9fdb4a0ee3bc6e11580237290c1620ba6b739676 Mon Sep 17 00:00:00 2001
From: guillaume <guillaume@lestanville.eu>
Date: Wed, 25 Feb 2015 16:37:00 +0100
Subject: [PATCH 15/93] Modification des attributs

---
 .gitattributes | 66 +++++++++++++++++++++++++-------------------------
 INSTALL        | 12 ++++-----
 index.php      |  2 +-
 3 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 0bea828e011..c5785ace780 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,33 +1,33 @@
-# Set default behaviour, in case users don't have core.autocrlf set.
-# More info: https://help.github.com/articles/dealing-with-line-endings
-* text=auto
-
-
-# Explicitly declare text files we want to always be normalized and converted 
-# to native line endings on checkout.
-*.php text eol=lf
-*.pl text eol=lf
-*.sql text eol=lf
-*.htm text eol=lf
-*.html text eol=lf
-*.js text eol=lf
-*.css text eol=lf
-*.lang text eol=lf
-*.txt text eol=lf
-*.md text eol=lf
-*.pp text eol=lf
-*.sh text eol=lf
-*.yaml text eol=lf
-
-.bash_aliases text eol=lf
-
-# Denote all files that are truly binary and should not be modified.
-*.bmp binary
-*.ico binary
-*.png binary
-*.jpg binary
-*.odt binary
-*.odf binary
-*.frm binary
-*.MYD binary
-*.MYI binary
+# Set default behaviour, in case users don't have core.autocrlf set.
+# More info: https://help.github.com/articles/dealing-with-line-endings
+* text=auto
+
+
+# Explicitly declare text files we want to always be normalized and converted 
+# to native line endings on checkout.
+*.php text eol=lf
+*.pl text eol=lf
+*.sql text eol=lf
+*.htm text eol=lf
+*.html text eol=lf
+*.js text eol=lf
+*.css text eol=lf
+*.lang text eol=lf
+*.txt text eol=lf
+*.md text eol=lf
+*.pp text eol=lf
+*.sh text eol=lf
+*.yaml text eol=lf
+
+.bash_aliases text eol=lf
+
+# Denote all files that are truly binary and should not be modified.
+*.bmp binary
+*.ico binary
+*.png binary
+*.jpg binary
+*.odt binary
+*.odf binary
+*.frm binary
+*.MYD binary
+*.MYI binary
diff --git a/INSTALL b/INSTALL
index 9f2fb214281..584c3f04713 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
-INSTALL
--------
-
-English:     See README.md file.
-
-French:      Voir fichier README-FR.md.
+INSTALL
+-------
+
+English:     See README.md file.
+
+French:      Voir fichier README-FR.md.
diff --git a/index.php b/index.php
index c59480bf4de..e4341bb53ec 100644
--- a/index.php
+++ b/index.php
@@ -1,2 +1,2 @@
-<?php
+<?php
 	header('Location: htdocs');
\ No newline at end of file

From 4ede9295a6799c6993f5625fed9a39077b0fa247 Mon Sep 17 00:00:00 2001
From: guillaume <guillaume@lestanville.eu>
Date: Fri, 27 Feb 2015 14:06:53 +0100
Subject: [PATCH 16/93] Correction de la gestion d'erreur.

---
 htdocs/core/db/sqlite.class.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php
index 6a2f8ca955c..3ec2a9397b7 100644
--- a/htdocs/core/db/sqlite.class.php
+++ b/htdocs/core/db/sqlite.class.php
@@ -452,7 +452,7 @@ class DoliDBSqlite extends DoliDB
         }
         catch(Exception $e)
         {
-            $this->error=$e->getMessage();
+            $this->error=$this->db->lastErrorMsg();
         }
 
         if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query))
@@ -645,7 +645,7 @@ class DoliDBSqlite extends DoliDB
                 return $errorcode_map[$this->db->errorCode()];
             }*/
             $errno=$this->db->lastErrorCode();
-			if ($errno=='HY000')
+			if ($errno=='HY000' || $errno == 0)
 			{
                 if (preg_match('/table.*already exists/i',$this->error))     return 'DB_ERROR_TABLE_ALREADY_EXISTS';
                 elseif (preg_match('/index.*already exists/i',$this->error)) return 'DB_ERROR_KEY_NAME_ALREADY_EXISTS';
@@ -656,6 +656,9 @@ class DoliDBSqlite extends DoliDB
                 if (preg_match('/column.* not unique/i',$this->error))       return 'DB_ERROR_RECORD_ALREADY_EXISTS';
                 elseif (preg_match('/PRIMARY KEY must be unique/i',$this->error)) return 'DB_ERROR_RECORD_ALREADY_EXISTS';
 			}
+			if ($errno > 1) {
+				// TODO Voir la liste des messages d'erreur
+			}
 
             return ($errno?'DB_ERROR_'.$errno:'0');
         }

From d80a8bbdba6135d32116e2df9549b6d02c198cd2 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon, 2 Mar 2015 10:13:06 +0100
Subject: [PATCH 17/93] revert bug1840 to eldy solution

---
 htdocs/core/class/doleditor.class.php     |  6 +-----
 htdocs/core/class/html.formmail.class.php | 16 +++-------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 5bc034831ca..0839639217f 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -43,7 +43,6 @@ class DolEditor
 	var $height;
 	var $width;
 	var $readonly;
-	var $allowed_content;
 
 
     /**
@@ -63,9 +62,8 @@ class DolEditor
      *      @param  int		$rows                   Size of rows for textarea tool
 	 *      @param  int		$cols                   Size of cols for textarea tool (textarea number of cols or %)
 	 *      @param	int		$readonly				0=Read/Edit, 1=Read only
-	 *      @param	int		$allowed_content		0=filter input text, 1=render as it is
 	 */
-    function __construct($htmlname,$content,$width='',$height=200,$toolbarname='Basic',$toolbarlocation='In',$toolbarstartexpanded=false,$uselocalbrowser=true,$okforextendededitor=true,$rows=0,$cols=0,$readonly=0,$allowed_content=0)
+    function __construct($htmlname,$content,$width='',$height=200,$toolbarname='Basic',$toolbarlocation='In',$toolbarstartexpanded=false,$uselocalbrowser=true,$okforextendededitor=true,$rows=0,$cols=0,$readonly=0)
     {
     	global $conf,$langs;
 
@@ -134,7 +132,6 @@ class DolEditor
             $this->cols					= (preg_match('/%/',$cols)?$cols:max(40,$cols));	// If $cols is a percent, we keep it, otherwise, we take max
             $this->height				= $height;
             $this->width				= $width;
-            $this->allowed_content		= $allowed_content;
     	}
 
     }
@@ -184,7 +181,6 @@ class DolEditor
             					{
             						/* property:xxx is same than CKEDITOR.config.property = xxx */
             						customConfig : ckeditorConfig,
-                            		allowedContent :'.($this->allowed_content?'true':'false').',
             						readOnly : '.($this->readonly?'true':'false').',
                             		htmlEncodeOutput :'.$htmlencode_force.',
             						allowedContent :'.(empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT)?'false':'true').',
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 668031aafe6..fa6a10024b9 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -584,13 +584,8 @@ class FormMail
         	if (! empty($this->withbody))
         	{
         		$defaultmessage="";
-        		$from_template=false;
-        		if (count($arraydefaultmessage) > 0 && $arraydefaultmessage['content']) {
-        			$defaultmessage=$arraydefaultmessage['content'];
-        			$from_template=true;
-        		} elseif (! is_numeric($this->withbody)) {
-        			$defaultmessage=$this->withbody;
-        		}
+        		if (count($arraydefaultmessage) > 0 && $arraydefaultmessage['content']) $defaultmessage=$arraydefaultmessage['content'];
+        		elseif (! is_numeric($this->withbody))	$defaultmessage=$this->withbody;
 
         		// Complete substitution array
         		if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_ADD_PAYMENT_URL))
@@ -620,11 +615,6 @@ class FormMail
 					$defaultmessage = dol_nl2br($defaultmessage);
 				}
 
-				if (dol_textishtml($defaultmessage) && $from_template) {
-					$allow_content=1;
-				} else {
-					$allow_content=0;
-				}
 
         		if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
 				else
@@ -655,7 +645,7 @@ class FormMail
 						else $this->withfckeditor=0;
         			}
 
-        			$doleditor=new DolEditor('message',$defaultmessage,'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,72,0,$allow_content);
+        			$doleditor=new DolEditor('message',$defaultmessage,'',280,$this->ckeditortoolbar,'In',true,true,$this->withfckeditor,8,72);
         			$out.= $doleditor->Create(1);
         		}
         		$out.= "</td></tr>\n";

From 8de170bfc2ed18fdb3817f809eadf4d4d3913b82 Mon Sep 17 00:00:00 2001
From: guillaume <guillaume@lestanville.eu>
Date: Tue, 3 Mar 2015 13:06:20 +0100
Subject: [PATCH 18/93] Ajout de fonctions pour le traitement des dates avec
 SQLITE.

---
 htdocs/core/db/sqlite.class.php | 156 ++++++++++++++++++++++++++++++--
 1 file changed, 146 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php
index 3ec2a9397b7..82de9b32103 100644
--- a/htdocs/core/db/sqlite.class.php
+++ b/htdocs/core/db/sqlite.class.php
@@ -40,6 +40,11 @@ class DoliDBSqlite extends DoliDB
 	//! Resultset of last query
 	private $_results;
 
+	const WEEK_MONDAY_FIRST=1;
+	const WEEK_YEAR = 2;
+	const WEEK_FIRST_WEEKDAY=4;
+
+
     /**
 	 *	Constructor.
 	 *	This create an opened connexion to a database server and eventually to a database
@@ -98,6 +103,11 @@ class DoliDBSqlite extends DoliDB
 
 			$this->addCustomFunction('IF');
 			$this->addCustomFunction('MONTH');
+			$this->addCustomFunction('CURTIME');
+			$this->addCustomFunction('CURDATE');
+			$this->addCustomFunction('WEEK', 1);
+			$this->addCustomFunction('WEEK', 2);
+			$this->addCustomFunction('WEEKDAY');
 			$this->addCustomFunction('date_format');
             //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         }
@@ -1212,12 +1222,14 @@ class DoliDBSqlite extends DoliDB
 	 * statique et publique. Le nombre de parametres est determine automatiquement.
 	 * @param string $name Le nom de la fonction a definir dans Sqlite
 	 */
-	private function addCustomFunction($name) {
+	private function addCustomFunction($name, $arg_count = -1) {
 		if ($this->db) {
 			$localname = __CLASS__ . '::' . 'db_' . $name;
 			$reflectClass = new ReflectionClass(__CLASS__);
 			$reflectFunction = $reflectClass->getMethod('db_' . $name);
-			$arg_count = $reflectFunction->getNumberOfParameters();
+			if ($arg_count < 0) {
+				$arg_count = $reflectFunction->getNumberOfParameters();
+			}
 			if (!$this->db->createFunction($name, $localname , $arg_count)) {
 				$this->error = "unable to create custom function '$name'";
 			}
@@ -1233,6 +1245,32 @@ class DoliDBSqlite extends DoliDB
 		return date('n', strtotime($date));
 	}
 
+	/**
+	 *  calcule du numéro de semaine
+	 *
+	 *  @param string date
+	 *  @param int mode
+	 */
+	public static function db_WEEK($date, $mode = 0) {
+		$arr = date_parse($date);
+		$calc_year = 0;
+		return self::calc_week($arr['year'], $arr['month'], $arr['day'], self::week_mode($mode), $calc_year);
+	}
+
+	public static function db_CURDATE() {
+		return date('Y-m-d');
+	}
+
+	public static function db_CURTIME() {
+		return date('H:i:s');
+	}
+
+	public static function db_WEEKDAY($date) {
+		$arr = date_parse($date);
+		return self::calc_weekday(self::calc_daynr($arr['year'], $arr['month'], $arr['day']), 0);
+
+	}
+
 	/**
 	 * Cette fonction est l'equivelent de la fonction date_format de MySQL.
 	 * @staticvar string $mysql_replacement	Les symboles formatage a remplacer
@@ -1256,24 +1294,17 @@ class DoliDBSqlite extends DoliDB
 				'h' => 'h',
 				'I' => 'h',
 				'i' => 'i',
-				'j' => 'z',
 				'k' => 'H',
 				'l' => 'g',
 				'M' => 'F',
 				'm' => 'm',
 				'p' => 'A',
-				'r' => 'h:i:sA',
+				'r' => 'h:i:s A',
 				'S' => 's',
 				's' => 's',
 				'T' => 'H:i:s',
-				'U' => '',	//?
-				'u' => '',	//?
-				'V' => '',	//?
-				'v' => '',	//?
 				'W' => 'l',
 				'w' => 'w',
-				'X' => '',	//?
-				'x' => '',	//?
 				'Y' => 'Y',
 				'y' => 'y',
 			);
@@ -1282,6 +1313,11 @@ class DoliDBSqlite extends DoliDB
 		$fmt = '';
 		$lg = strlen($format);
 		$state = 0;
+		$timestamp = strtotime($date);
+		$yday = date('z', $timestamp);
+		$month = (integer)date("n", $timestamp);
+		$year = (integer)date("Y", $timestamp);
+		$day = (integer)date("d", $timestamp);
 		for($idx = 0; $idx < $lg; ++$idx) {
 			$char = $format[$idx];
 			if ($state == 0) {
@@ -1295,6 +1331,32 @@ class DoliDBSqlite extends DoliDB
 				if (array_key_exists($char, $mysql_replacement)) {
 					$fmt .= $mysql_replacement[$char];
 				} else {
+					$calc_year = 0;
+					switch ($char) {
+						case 'j':	// day of the year 001 - OK
+							$char = sprintf("%03d", $yday+1);
+							break;
+						case 'U': // mode 0: semaine 0 = premiere semaine complète qui commence un dimanche
+							$char = sprintf("%02d", self::calc_week($year, $month, $day, 4, $calc_year));
+							break;
+						case 'u': // mode 1: semaine 0 = première semaine de 4 jours. Début le dimanche
+							$char = sprintf("%02d", self::calc_week($year, $month, $day, 1, $calc_year));
+							break;
+						case 'V': // mode 2: semaine 1 = premiere semaine complète qui commence un dimanche - KO
+							$char = sprintf("%02d", self::calc_week($year, $month, $day, 6, $calc_year));
+							break;
+						case 'v':  // mode 3: semaine 1 = premiere semaine de 4 jours. Début le lundi - OK
+							$char = sprintf("%02d", self::calc_week($year, $month, $day, 3, $calc_year));
+							break;
+						case 'X':
+							self::calc_week($year, $month, $day, 6, $calc_year);
+							$char = sprintf("%04d", $calc_year);
+							break;
+						case 'x':
+							self::calc_week($year, $month, $day, 3, $calc_year);
+							$char = sprintf("%04d", $calc_year);
+							break;
+					}
 					$fmt .= $char;
 				}
 				$state = 0;
@@ -1313,5 +1375,79 @@ class DoliDBSqlite extends DoliDB
 	public static function db_IF($test, $true_part, $false_part) {
 		return ( $test ) ? $true_part : $false_part;
 	}
+
+	// Adapté de mytime.c des sources de mariadb
+	// fonction calc_daynr
+	private static function calc_daynr($year, $month, $day) {
+		$y = $year;
+		if ($y == 0 && $month == 0) return 0;
+		$num = (365* $y + 31 * ($month - 1) + $day);
+		if ($month <= 2) {
+			$y--; }
+		else {
+			$num -= floor(($month * 4 + 23) / 10);
+		}
+		$temp = floor(($y / 100 + 1) * 3 / 4);
+		return $num + floor($y / 4) - $temp;
+	}
+
+	private static function calc_weekday($daynr, $sunday_first_day_of_week) {
+	  $ret = floor(($daynr + 5 + ($sunday_first_day_of_week ? 1 : 0)) % 7);
+	  return $ret;
+	}
+
+	private static function calc_days_in_year($year)
+	{
+	  return (($year & 3) == 0 && ($year%100 || ($year%400 == 0 && $year)) ? 366 : 365);
+	}
+
+	private static function week_mode($mode) {
+		$week_format= ($mode & 7);
+		if (!($week_format & self::WEEK_MONDAY_FIRST)) {
+			$week_format^= self::WEEK_FIRST_WEEKDAY;
+		}
+		return $week_format;
+	}
+
+
+	private static function calc_week($year, $month, $day, $week_behaviour, &$calc_year) {
+		$daynr=self::calc_daynr($year,$month,$day);
+		$first_daynr=self::calc_daynr($year,1,1);
+		$monday_first= ($week_behaviour & self::WEEK_MONDAY_FIRST) ? 1 : 0;
+		$week_year= ($week_behaviour & self::WEEK_YEAR) ? 1 : 0;
+		$first_weekday= ($week_behaviour & self::WEEK_FIRST_WEEKDAY) ? 1 : 0;
+
+		$weekday=self::calc_weekday($first_daynr, !$monday_first);
+		$calc_year=$year;
+
+		if ($month == 1 && $day <= 7-$weekday)
+		{
+			if (!$week_year && (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)))
+				return 0;
+			$week_year= 1;
+			$calc_year--;
+			$first_daynr-= ($days=self::calc_days_in_year($calc_year));
+			$weekday= ($weekday + 53*7- $days) % 7;
+	  }
+
+	  if (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)) {
+		$days= $daynr - ($first_daynr+ (7-$weekday));
+	  }
+	  else {
+		$days= $daynr - ($first_daynr - $weekday);
+	  }
+
+	  if ($week_year && $days >= 52*7)
+	  {
+		$weekday= ($weekday + self::calc_days_in_year($calc_year)) % 7;
+		if ((!$first_weekday && $weekday < 4) || ($first_weekday && $weekday == 0))
+		{
+		  $calc_year++;
+		  return 1;
+		}
+	  }
+	  return floor($days/7+1);
+	}
+
 }
 

From e4edafd42a0ea845d83d9a90509b11594c88646f Mon Sep 17 00:00:00 2001
From: guillaume <guillaume@lestanville.eu>
Date: Tue, 3 Mar 2015 15:21:14 +0100
Subject: [PATCH 19/93] =?UTF-8?q?Ajout=20de=20la=20liste=20des=20param?=
 =?UTF-8?q?=C3=A8tres=20en=20utilisant=20l'instruction=20PRAGMA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/core/db/sqlite.class.php | 47 ++++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php
index 82de9b32103..513aaf63ac3 100644
--- a/htdocs/core/db/sqlite.class.php
+++ b/htdocs/core/db/sqlite.class.php
@@ -1183,15 +1183,37 @@ class DoliDBSqlite extends DoliDB
     function getServerParametersValues($filter='')
     {
         $result=array();
+		static $pragmas;
+		if (! isset($pragmas)) {
+			$pragmas = array(
+				'application_id', 'auto_vacuum', 'automatic_index', 'busy_timeout', 'cache_size',
+				'cache_spill', 'case_sensitive_like', 'checkpoint_fullsync', 'collation_list',
+				'compile_options', 'data_version',	/*'database_list',*/
+				'defer_foreign_keys', 'encoding', 'foreign_key_check', 'freelist_count',
+				'full_column_names', 'fullsync', 'ingore_check_constraints', 'integrity_check',
+				'journal_mode', 'journal_size_limit', 'legacy_file_format', 'locking_mode',
+				'max_page_count', 'page_count', 'page_size', 'parser_trace',
+				'query_only', 'quick_check', 'read_uncommitted', 'recursive_triggers',
+				'reverse_unordered_selects', 'schema_version', 'user_version',
+				'secure_delete', 'short_column_names', 'shrink_memory', 'soft_heap_limit',
+				'synchronous', 'temp_store', /*'temp_store_directory',*/ 'threads',
+				'vdbe_addoptrace', 'vdbe_debug', 'vdbe_listing', 'vdbe_trace',
+				'wal_autocheckpoint',
+				// TODO poursuivre la liste cf. http://www.sqlite.org/pragma.html
+			);
+		}
 
-        $sql='SHOW VARIABLES';
-        if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
-        $resql=$this->query($sql);
-        if ($resql)
-        {
-            while ($obj=$this->fetch_object($resql)) $result[$obj->Variable_name]=$obj->Value;
-        }
-
+		// TODO prendre en compte le filtre
+		foreach($pragmas as $var) {
+			$sql = "PRAGMA $var";
+			$resql=$this->query($sql);
+			if ($resql)
+			{
+				$obj = $this->fetch_row($resql);
+				//dol_syslog(get_class($this)."::select_db getServerParametersValues $var=". print_r($obj, true), LOG_DEBUG);
+				$result[$var] = $obj[0];
+			}
+		}
         return $result;
     }
 
@@ -1204,7 +1226,7 @@ class DoliDBSqlite extends DoliDB
     function getServerStatusValues($filter='')
     {
         $result=array();
-
+		/*
         $sql='SHOW STATUS';
         if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
         $resql=$this->query($sql);
@@ -1212,6 +1234,7 @@ class DoliDBSqlite extends DoliDB
         {
             while ($obj=$this->fetch_object($resql)) $result[$obj->Variable_name]=$obj->Value;
         }
+		 */
 
         return $result;
     }
@@ -1333,7 +1356,7 @@ class DoliDBSqlite extends DoliDB
 				} else {
 					$calc_year = 0;
 					switch ($char) {
-						case 'j':	// day of the year 001 - OK
+						case 'j':	// day of the year 001
 							$char = sprintf("%03d", $yday+1);
 							break;
 						case 'U': // mode 0: semaine 0 = premiere semaine complète qui commence un dimanche
@@ -1342,10 +1365,10 @@ class DoliDBSqlite extends DoliDB
 						case 'u': // mode 1: semaine 0 = première semaine de 4 jours. Début le dimanche
 							$char = sprintf("%02d", self::calc_week($year, $month, $day, 1, $calc_year));
 							break;
-						case 'V': // mode 2: semaine 1 = premiere semaine complète qui commence un dimanche - KO
+						case 'V': // mode 2: semaine 1 = premiere semaine complète qui commence un dimanche
 							$char = sprintf("%02d", self::calc_week($year, $month, $day, 6, $calc_year));
 							break;
-						case 'v':  // mode 3: semaine 1 = premiere semaine de 4 jours. Début le lundi - OK
+						case 'v':  // mode 3: semaine 1 = premiere semaine de 4 jours. Début le lundi
 							$char = sprintf("%02d", self::calc_week($year, $month, $day, 3, $calc_year));
 							break;
 						case 'X':

From 1b89b8c808057325e9d5e61a999ba05165057244 Mon Sep 17 00:00:00 2001
From: guillaume <guillaume@lestanville.eu>
Date: Tue, 3 Mar 2015 15:22:52 +0100
Subject: [PATCH 20/93] =?UTF-8?q?Ajout=20de=20la=20liste=20des=20param?=
 =?UTF-8?q?=C3=A8tres=20en=20utilisant=20l'instruction=20PRAGMA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php
index 513aaf63ac3..77e9dcdba54 100644
--- a/htdocs/core/db/sqlite.class.php
+++ b/htdocs/core/db/sqlite.class.php
@@ -1185,6 +1185,9 @@ class DoliDBSqlite extends DoliDB
         $result=array();
 		static $pragmas;
 		if (! isset($pragmas)) {
+			// Définition de la liste des pragmas utilisés qui ne retournent qu'une seule valeur
+			// indépendante de la base de données.
+			// cf. http://www.sqlite.org/pragma.html
 			$pragmas = array(
 				'application_id', 'auto_vacuum', 'automatic_index', 'busy_timeout', 'cache_size',
 				'cache_spill', 'case_sensitive_like', 'checkpoint_fullsync', 'collation_list',
@@ -1199,7 +1202,6 @@ class DoliDBSqlite extends DoliDB
 				'synchronous', 'temp_store', /*'temp_store_directory',*/ 'threads',
 				'vdbe_addoptrace', 'vdbe_debug', 'vdbe_listing', 'vdbe_trace',
 				'wal_autocheckpoint',
-				// TODO poursuivre la liste cf. http://www.sqlite.org/pragma.html
 			);
 		}
 

From 5a5a2f1bcf4e7bb73eb7485d01a79d102eb65e17 Mon Sep 17 00:00:00 2001
From: guillaume <guillaume@lestanville.eu>
Date: Tue, 3 Mar 2015 15:54:55 +0100
Subject: [PATCH 21/93] =?UTF-8?q?Affichage=20de=20la=20liste=20des=20table?=
 =?UTF-8?q?s=20dans=20les=20infos=20de=20base=20de=20donn=C3=A9es.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/admin/system/database-tables.php | 37 +++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index a29c8e66b32..3af715a09b8 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -66,6 +66,10 @@ else if ($conf->db->type == 'mssql')
 	//$sqls[0] = "";
 	//$base=3;
 }
+else if ($conf->db->type == 'sqlite') {
+	//$sql = "SELECT name, type FROM sqlite_master";
+	$base = 4;
+}
 
 
 if (! $base)
@@ -169,6 +173,39 @@ else
 		}
 		print '</table>';
 	}
+
+	if ($base == 4)
+	{
+		print '<table class="noborder">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("TableName").'</td>';
+		print '<td>Rows</td>';
+		print "</tr>\n";
+
+		$sql = "SELECT name, type FROM sqlite_master where type='table' and name not like 'sqlite%' ORDER BY name";
+		$resql = $db->query($sql);
+
+		if ($resql)
+		{
+			$var=True;
+			while ($row = $db->fetch_row($resql)) {
+
+				$rescount = $db->query("SELECT COUNT(*) FROM " . $row[0]);
+				if ($rescount) {
+					$row_count = $db->fetch_row($rescount);
+					$count = $row_count[0];
+				} else {
+					$count = '?';
+				}
+
+				print "<tr ".$bc[$var].">";
+				print '<td>'.$row[0].'</td>';
+				print '<td>'.$count.'</td>';
+				print '</tr>';
+			}
+		}
+
+	}
 }
 
 llxFooter();

From d549030078b76e2b4589f925be161f1c7161ac4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 5 Mar 2015 10:20:32 +0100
Subject: [PATCH 22/93] Fixed bug with hide/show checkboxes reported by Ruben
 Almeida (aruben)

---
 htdocs/comm/action/index.php | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 6baa03ba87e..a5b83217c80 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2014      Cedric GROSS         <c.gross@kreiz-it.fr>
+ * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.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
@@ -361,19 +362,23 @@ if (! empty($conf->use_javascript_ajax))
 	$s.='<div class="nowrap clear float"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked="true" disabled="disabled"> ' . $langs->trans("LocalAgenda").' &nbsp; </div>';
 	if (is_array($showextcals) && count($showextcals) > 0)
 	{
+		$s.='<script type="text/javascript">' . "\n";
+		$s.='jQuery(document).ready(function () {
+
+				jQuery("table input[name^=\"check_\"]").click(function() {
+					var name = $(this).attr("name");
+
+					jQuery(".family_" + name.replace("check_", "")).toggle();
+                });
+
+			});' . "\n";
+		$s.='</script>' . "\n";
+
 		foreach ($showextcals as $val)
 		{
-			$htmlname = dol_string_nospecial($val['name']);
-			$htmlname = dol_string_nospecial($htmlname,'_',array("\.","#"));
-			$s.='<script type="text/javascript">' . "\n";
-			$s.='jQuery(document).ready(function () {' . "\n";
-			$s.='		jQuery("#check_' . $htmlname . '").click(function() {';
-			$s.=' 		/* alert("'.$htmlname.'"); */';
-			$s.=' 		jQuery(".family_' . $htmlname . '").toggle();';
-			$s.='		});' . "\n";
-			$s.='});' . "\n";
-			$s.='</script>' . "\n";
-			$s.='<div class="nowrap float"><input type="checkbox" id="check_' . $htmlname . '" name="check_' . $htmlname . '" checked="true"> ' . $val ['name'] . ' &nbsp; </div>';
+			$htmlname = md5($val['name']);
+
+			$s.='<div class="nowrap float"><input type="checkbox" id="check_' . $htmlname . '" name="check_ext' . $htmlname . '" checked="true"> ' . $val ['name'] . ' &nbsp; </div>';
 		}
 	}
 	$s.='<div class="nowrap float"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
@@ -1174,7 +1179,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     		$numicals[dol_string_nospecial($event->icalname)]++;
                     	}
                     	$color=$event->icalcolor;
-                    	$cssclass=(! empty($event->icalname)?'family_'.dol_string_nospecial($event->icalname):'family_other unmovable');
+                    	$cssclass=(! empty($event->icalname)?'family_ext'.md5($event->icalname):'family_other unmovable');
                     }
                     else if ($event->type_code == 'BIRTHDAY')
                     {

From c9b3cab22b23b2765043d99afc7b766b69778427 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Thu, 5 Mar 2015 10:22:22 +0100
Subject: [PATCH 23/93] Mytasks is not clickable

---
 htdocs/comm/action/index.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index a5b83217c80..5ba3a4d9b0b 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -348,7 +348,6 @@ if (! empty($conf->use_javascript_ajax))
 	$s='';
 	$s.='<script type="text/javascript">' . "\n";
 	$s.='jQuery(document).ready(function () {' . "\n";
-	$s.='jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });' . "\n";
 	$s.='jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });' . "\n";
 	$s.='jQuery(".family_birthday").toggle();' . "\n";
 	if ($action=="show_week" || $action=="show_month" || empty($action))
@@ -369,7 +368,7 @@ if (! empty($conf->use_javascript_ajax))
 					var name = $(this).attr("name");
 
 					jQuery(".family_" + name.replace("check_", "")).toggle();
-                });
+				});
 
 			});' . "\n";
 		$s.='</script>' . "\n";

From 0ef46b06f400487e7350e94fe8d6346ccbdf0df2 Mon Sep 17 00:00:00 2001
From: guillaume <guillaume@lestanville.eu>
Date: Thu, 5 Mar 2015 10:52:37 +0100
Subject: [PATCH 24/93] Sqlite3-PDO restoration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

FR:
- Restauration de la version PDO dans sqlite.class.php et désactivation.
- Ajout de la classe de base de données Sqlite3 dans sqlite3.class.php

EN:
- revert of the PDO version of sqlite.class.php and deactivation.
- add database class Sqlite3 into sqlite3.class.php.
---
 htdocs/admin/system/database-tables.php       |    3 +-
 htdocs/core/db/sqlite.class.php               |  378 +----
 htdocs/core/db/sqlite3.class.php              | 1478 +++++++++++++++++
 htdocs/install/etape2.php                     |    4 +-
 htdocs/install/fileconf.php                   |    7 +-
 .../functions/functions.sql                   |    0
 htdocs/install/{sqlite => sqlite3}/index.html |    0
 7 files changed, 1540 insertions(+), 330 deletions(-)
 create mode 100644 htdocs/core/db/sqlite3.class.php
 rename htdocs/install/{sqlite => sqlite3}/functions/functions.sql (100%)
 rename htdocs/install/{sqlite => sqlite3}/index.html (100%)

diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 3af715a09b8..5ac7292042e 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -66,7 +66,7 @@ else if ($conf->db->type == 'mssql')
 	//$sqls[0] = "";
 	//$base=3;
 }
-else if ($conf->db->type == 'sqlite') {
+else if ($conf->db->type == 'sqlite3') {
 	//$sql = "SELECT name, type FROM sqlite_master";
 	$base = 4;
 }
@@ -176,6 +176,7 @@ else
 
 	if ($base == 4)
 	{
+		// Sqlite3
 		print '<table class="noborder">';
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("TableName").'</td>';
diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php
index 77e9dcdba54..786bf435fcf 100644
--- a/htdocs/core/db/sqlite.class.php
+++ b/htdocs/core/db/sqlite.class.php
@@ -34,16 +34,17 @@ class DoliDBSqlite extends DoliDB
     //! Database type
     public $type='sqlite';
     //! Database label
-    const LABEL='Sqlite3';
+    const LABEL='PDO Sqlite';
     //! Version min database
     const VERSIONMIN='3.0.0';
 	//! Resultset of last query
 	private $_results;
 
-	const WEEK_MONDAY_FIRST=1;
-	const WEEK_YEAR = 2;
-	const WEEK_FIRST_WEEKDAY=4;
-
+	/**
+	 * Indique que les fonctions personnalisées sont définies
+	 * @var boolean
+	 */
+	private static $customFunctionsDefined = false;
 
     /**
 	 *	Constructor.
@@ -101,15 +102,7 @@ class DoliDBSqlite extends DoliDB
             $this->database_selected = 1;
             $this->database_name = $name;
 
-			$this->addCustomFunction('IF');
-			$this->addCustomFunction('MONTH');
-			$this->addCustomFunction('CURTIME');
-			$this->addCustomFunction('CURDATE');
-			$this->addCustomFunction('WEEK', 1);
-			$this->addCustomFunction('WEEK', 2);
-			$this->addCustomFunction('WEEKDAY');
-			$this->addCustomFunction('date_format');
-            //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+            $this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         }
         else
         {
@@ -329,16 +322,14 @@ class DoliDBSqlite extends DoliDB
         if (empty($dir)) $dir=DOL_DATA_ROOT;
         // With sqlite, port must be in connect parameters
         //if (! $newport) $newport=3306;
-		$database_name = $dir.'/database_'.$name.'.sdb';
         try {
             /*** connect to SQLite database ***/
-            //$this->db = new PDO("sqlite:".$dir.'/database_'.$name.'.sdb');
-			$this->db = new SQLite3($database_name);
-            //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+            $this->db = new PDO("sqlite:".$dir.'/database_'.$name.'.sdb');
+            $this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         }
-        catch(Exception $e)
+        catch(PDOException $e)
         {
-            $this->error=  self::LABEL.' '.$e->getMessage().' current dir='.$database_name;
+            $this->error='PDO SQLITE '.$e->getMessage().' current dir='.$dir.'/database_'.$name.'.sdb';
             return '';
         }
 
@@ -354,7 +345,9 @@ class DoliDBSqlite extends DoliDB
      */
     function getVersion()
     {
-		return $this->db->version()['versionString'];
+        $resql=$this->query('SELECT sqlite_version() as sqliteversion');
+        $row=$this->fetch_row($resql);
+        return $row[0];
     }
 
     /**
@@ -383,7 +376,6 @@ class DoliDBSqlite extends DoliDB
         {
 	        if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
             $this->connected=0;
-			$this->db->close();
             $this->db=null;    // Clean this->db
             return true;
         }
@@ -419,10 +411,13 @@ class DoliDBSqlite extends DoliDB
 			$constraintname=trim($reg[2]);
 			$tablename=trim($reg[1]);
 
-			$descTable = $this->db->querySingle("SELECT sql FROM sqlite_master WHERE name='" . $tablename . "'");
+			$res = $this->db->query("SELECT sql FROM sqlite_master WHERE name='" . $tablename . "'");
+			$descTable = $res->fetchColumn();
+			$res->closeCursor();
 
 			// 1- Renommer la table avec un nom temporaire
-			$this->query('ALTER TABLE ' . $tablename . ' RENAME TO tmp_' . $tablename);
+			$res = $this->query('ALTER TABLE ' . $tablename . ' RENAME TO tmp_' . $tablename);
+			$res->closeCursor();
 
 			// 2- Recréer la table avec la contrainte ajoutée
 
@@ -434,13 +429,17 @@ class DoliDBSqlite extends DoliDB
 			$descTable .= ')';
 
 			// Création proprement dite de la table
-			$this->query($descTable);
+			$res = $this->query($descTable);
+			$res->closeCursor();
 
 			// 3- Transférer les données
-			$this->query('INSERT INTO ' . $tablename . ' SELECT * FROM tmp_' . $tablename);
+			$res = $this->query('INSERT INTO ' . $tablename . ' SELECT * FROM tmp_' . $tablename);
+			$res->closeCursor();
+
 
 			// 4- Supprimer la table temporaire
-			$this->query('DROP TABLE tmp_' . $tablename);
+			$res = $this->query('DROP TABLE tmp_' . $tablename);
+			$res->closeCursor();
 
 			// dummy statement
 			$query="SELECT 0";
@@ -456,13 +455,10 @@ class DoliDBSqlite extends DoliDB
         try {
             //$ret = $this->db->exec($query);
             $ret = $this->db->query($query);        // $ret is a PDO object
-			if ($ret) {
-				$ret->queryString = $query;
-			}
         }
-        catch(Exception $e)
+        catch(PDOException $e)
         {
-            $this->error=$this->db->lastErrorMsg();
+            $this->error=$e->getMessage();
         }
 
         if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query))
@@ -501,11 +497,7 @@ class DoliDBSqlite extends DoliDB
     {
         // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
-        //return $resultset->fetch(PDO::FETCH_OBJ);
-		$ret = $resultset->fetchArray(SQLITE3_ASSOC);
-		if ($ret) {
-			return (object)$ret;
-		}
+        return $resultset->fetch(PDO::FETCH_OBJ);
     }
 
 
@@ -519,11 +511,7 @@ class DoliDBSqlite extends DoliDB
     {
         // If resultset not provided, we take the last used by connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
-        //return $resultset->fetch(PDO::FETCH_ASSOC);
-		$ret = $resultset->fetchArray(SQLITE3_ASSOC);
-		if ($ret) {
-			return (array)$ret;
-		}
+        return $resultset->fetch(PDO::FETCH_ASSOC);
     }
 
     /**
@@ -538,7 +526,7 @@ class DoliDBSqlite extends DoliDB
         if (! is_bool($resultset))
         {
             if (! is_object($resultset)) { $resultset=$this->_results; }
-            return $resultset->fetchArray(SQLITE3_NUM);
+            return $resultset->fetch(PDO::FETCH_NUM);
         }
         else
         {
@@ -559,9 +547,10 @@ class DoliDBSqlite extends DoliDB
         // If resultset not provided, we take the last used by connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
 		if (preg_match("/^SELECT/i", $resultset->queryString)) {
-			return $this->db->querySingle("SELECT count(*) FROM (" . $resultset->queryString . ") q");
+			$res = $this->db->query("SELECT count(*) FROM (" . $resultset->queryString . ") q");
+			return $res->fetchColumn();
 		}
-		return 0;
+		return $resultset->rowCount();
     }
 
     /**
@@ -575,12 +564,9 @@ class DoliDBSqlite extends DoliDB
     {
         // If resultset not provided, we take the last used by connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
-		if (preg_match("/^SELECT/i", $resultset->queryString)) {
-			return $this->num_rows($resultset);
-		}
         // mysql necessite un link de base pour cette fonction contrairement
         // a pqsql qui prend un resultset
-        return $this->db->changes();
+        return $resultset->rowCount();
     }
 
 
@@ -595,7 +581,7 @@ class DoliDBSqlite extends DoliDB
         // If resultset not provided, we take the last used by connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
         // Si resultset en est un, on libere la memoire
-        if ($resultset && is_object($resultset)) $resultset->finalize();
+        if (is_object($resultset)) $resultset->closeCursor();
     }
 
 	/**
@@ -606,7 +592,12 @@ class DoliDBSqlite extends DoliDB
 	 */
     function escape($stringtoencode)
     {
-		return Sqlite3::escapeString($stringtoencode);
+		$ret = $this->db->quote($stringtoencode);
+		$l = strlen($ret);
+		if ($l >= 2) {
+			return substr($ret, 1, $l -2);
+		}
+		return '';
     }
 
     /**
@@ -654,8 +645,8 @@ class DoliDBSqlite extends DoliDB
             {
                 return $errorcode_map[$this->db->errorCode()];
             }*/
-            $errno=$this->db->lastErrorCode();
-			if ($errno=='HY000' || $errno == 0)
+            $errno=$this->db->errorCode();
+			if ($errno=='HY000')
 			{
                 if (preg_match('/table.*already exists/i',$this->error))     return 'DB_ERROR_TABLE_ALREADY_EXISTS';
                 elseif (preg_match('/index.*already exists/i',$this->error)) return 'DB_ERROR_KEY_NAME_ALREADY_EXISTS';
@@ -666,9 +657,6 @@ class DoliDBSqlite extends DoliDB
                 if (preg_match('/column.* not unique/i',$this->error))       return 'DB_ERROR_RECORD_ALREADY_EXISTS';
                 elseif (preg_match('/PRIMARY KEY must be unique/i',$this->error)) return 'DB_ERROR_RECORD_ALREADY_EXISTS';
 			}
-			if ($errno > 1) {
-				// TODO Voir la liste des messages d'erreur
-			}
 
             return ($errno?'DB_ERROR_'.$errno:'0');
         }
@@ -699,7 +687,7 @@ class DoliDBSqlite extends DoliDB
      */
     function last_insert_id($tab,$fieldid='rowid')
     {
-        return $this->db->lastInsertRowId();
+        return $this->db->lastInsertId();
     }
 
     /**
@@ -1183,39 +1171,15 @@ class DoliDBSqlite extends DoliDB
     function getServerParametersValues($filter='')
     {
         $result=array();
-		static $pragmas;
-		if (! isset($pragmas)) {
-			// Définition de la liste des pragmas utilisés qui ne retournent qu'une seule valeur
-			// indépendante de la base de données.
-			// cf. http://www.sqlite.org/pragma.html
-			$pragmas = array(
-				'application_id', 'auto_vacuum', 'automatic_index', 'busy_timeout', 'cache_size',
-				'cache_spill', 'case_sensitive_like', 'checkpoint_fullsync', 'collation_list',
-				'compile_options', 'data_version',	/*'database_list',*/
-				'defer_foreign_keys', 'encoding', 'foreign_key_check', 'freelist_count',
-				'full_column_names', 'fullsync', 'ingore_check_constraints', 'integrity_check',
-				'journal_mode', 'journal_size_limit', 'legacy_file_format', 'locking_mode',
-				'max_page_count', 'page_count', 'page_size', 'parser_trace',
-				'query_only', 'quick_check', 'read_uncommitted', 'recursive_triggers',
-				'reverse_unordered_selects', 'schema_version', 'user_version',
-				'secure_delete', 'short_column_names', 'shrink_memory', 'soft_heap_limit',
-				'synchronous', 'temp_store', /*'temp_store_directory',*/ 'threads',
-				'vdbe_addoptrace', 'vdbe_debug', 'vdbe_listing', 'vdbe_trace',
-				'wal_autocheckpoint',
-			);
-		}
 
-		// TODO prendre en compte le filtre
-		foreach($pragmas as $var) {
-			$sql = "PRAGMA $var";
-			$resql=$this->query($sql);
-			if ($resql)
-			{
-				$obj = $this->fetch_row($resql);
-				//dol_syslog(get_class($this)."::select_db getServerParametersValues $var=". print_r($obj, true), LOG_DEBUG);
-				$result[$var] = $obj[0];
-			}
-		}
+        $sql='SHOW VARIABLES';
+        if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
+        $resql=$this->query($sql);
+        if ($resql)
+        {
+            while ($obj=$this->fetch_object($resql)) $result[$obj->Variable_name]=$obj->Value;
+        }
+
         return $result;
     }
 
@@ -1228,7 +1192,7 @@ class DoliDBSqlite extends DoliDB
     function getServerStatusValues($filter='')
     {
         $result=array();
-		/*
+
         $sql='SHOW STATUS';
         if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
         $resql=$this->query($sql);
@@ -1236,243 +1200,9 @@ class DoliDBSqlite extends DoliDB
         {
             while ($obj=$this->fetch_object($resql)) $result[$obj->Variable_name]=$obj->Value;
         }
-		 */
 
         return $result;
     }
 
-	/**
-	 * Permet le chargement d'une fonction personnalisee dans le moteur de base de donnees.
-	 * Note: le nom de la fonction personnalisee est prefixee par 'db_'. La fonction doit être
-	 * statique et publique. Le nombre de parametres est determine automatiquement.
-	 * @param string $name Le nom de la fonction a definir dans Sqlite
-	 */
-	private function addCustomFunction($name, $arg_count = -1) {
-		if ($this->db) {
-			$localname = __CLASS__ . '::' . 'db_' . $name;
-			$reflectClass = new ReflectionClass(__CLASS__);
-			$reflectFunction = $reflectClass->getMethod('db_' . $name);
-			if ($arg_count < 0) {
-				$arg_count = $reflectFunction->getNumberOfParameters();
-			}
-			if (!$this->db->createFunction($name, $localname , $arg_count)) {
-				$this->error = "unable to create custom function '$name'";
-			}
-		}
-	}
-
-	/**
-	 * Cette fonction est l'equivalent de la fonction MONTH de MySql.
-	 * @param string $date
-	 * @return integer
-	 */
-	public static function db_MONTH($date) {
-		return date('n', strtotime($date));
-	}
-
-	/**
-	 *  calcule du numéro de semaine
-	 *
-	 *  @param string date
-	 *  @param int mode
-	 */
-	public static function db_WEEK($date, $mode = 0) {
-		$arr = date_parse($date);
-		$calc_year = 0;
-		return self::calc_week($arr['year'], $arr['month'], $arr['day'], self::week_mode($mode), $calc_year);
-	}
-
-	public static function db_CURDATE() {
-		return date('Y-m-d');
-	}
-
-	public static function db_CURTIME() {
-		return date('H:i:s');
-	}
-
-	public static function db_WEEKDAY($date) {
-		$arr = date_parse($date);
-		return self::calc_weekday(self::calc_daynr($arr['year'], $arr['month'], $arr['day']), 0);
-
-	}
-
-	/**
-	 * Cette fonction est l'equivelent de la fonction date_format de MySQL.
-	 * @staticvar string $mysql_replacement	Les symboles formatage a remplacer
-	 * @param string $date la date dans un format ISO
-	 * @param string $format la chaine de formatage
-	 * @return string La date formatee.
-	 */
-	public static function db_date_format($date, $format) {
-		static $mysql_replacement;
-		if (! isset($mysql_replacement)) {
-			$mysql_replacement = array(
-				'%' => '%',
-				'a' => 'D',
-				'b' => 'M',
-				'c' => 'n',
-				'D' => 'jS',
-				'd' => 'd',
-				'e' => 'j',
-				'f' => 'u',
-				'H' => 'H',
-				'h' => 'h',
-				'I' => 'h',
-				'i' => 'i',
-				'k' => 'H',
-				'l' => 'g',
-				'M' => 'F',
-				'm' => 'm',
-				'p' => 'A',
-				'r' => 'h:i:s A',
-				'S' => 's',
-				's' => 's',
-				'T' => 'H:i:s',
-				'W' => 'l',
-				'w' => 'w',
-				'Y' => 'Y',
-				'y' => 'y',
-			);
-		}
-
-		$fmt = '';
-		$lg = strlen($format);
-		$state = 0;
-		$timestamp = strtotime($date);
-		$yday = date('z', $timestamp);
-		$month = (integer)date("n", $timestamp);
-		$year = (integer)date("Y", $timestamp);
-		$day = (integer)date("d", $timestamp);
-		for($idx = 0; $idx < $lg; ++$idx) {
-			$char = $format[$idx];
-			if ($state == 0) {
-				if ($char == '%') {
-					$state = 1;
-				} else {
-					$fmt .= $char;
-				}
-			}
-			elseif ($state == 1) {
-				if (array_key_exists($char, $mysql_replacement)) {
-					$fmt .= $mysql_replacement[$char];
-				} else {
-					$calc_year = 0;
-					switch ($char) {
-						case 'j':	// day of the year 001
-							$char = sprintf("%03d", $yday+1);
-							break;
-						case 'U': // mode 0: semaine 0 = premiere semaine complète qui commence un dimanche
-							$char = sprintf("%02d", self::calc_week($year, $month, $day, 4, $calc_year));
-							break;
-						case 'u': // mode 1: semaine 0 = première semaine de 4 jours. Début le dimanche
-							$char = sprintf("%02d", self::calc_week($year, $month, $day, 1, $calc_year));
-							break;
-						case 'V': // mode 2: semaine 1 = premiere semaine complète qui commence un dimanche
-							$char = sprintf("%02d", self::calc_week($year, $month, $day, 6, $calc_year));
-							break;
-						case 'v':  // mode 3: semaine 1 = premiere semaine de 4 jours. Début le lundi
-							$char = sprintf("%02d", self::calc_week($year, $month, $day, 3, $calc_year));
-							break;
-						case 'X':
-							self::calc_week($year, $month, $day, 6, $calc_year);
-							$char = sprintf("%04d", $calc_year);
-							break;
-						case 'x':
-							self::calc_week($year, $month, $day, 3, $calc_year);
-							$char = sprintf("%04d", $calc_year);
-							break;
-					}
-					$fmt .= $char;
-				}
-				$state = 0;
-			}
-		}
-		return date($fmt, strtotime($date));
-	}
-
-	/**
-	 * Equivalent de la fonction MySQL IF
-	 * @param boolean $test Le resultat du test
-	 * @param mixed $true_part Partie a retourner si vrai
-	 * @param mixed $false_part Partie a retourner si faux
-	 * @return mixed Partie selectionnee en fonction du test
-	 */
-	public static function db_IF($test, $true_part, $false_part) {
-		return ( $test ) ? $true_part : $false_part;
-	}
-
-	// Adapté de mytime.c des sources de mariadb
-	// fonction calc_daynr
-	private static function calc_daynr($year, $month, $day) {
-		$y = $year;
-		if ($y == 0 && $month == 0) return 0;
-		$num = (365* $y + 31 * ($month - 1) + $day);
-		if ($month <= 2) {
-			$y--; }
-		else {
-			$num -= floor(($month * 4 + 23) / 10);
-		}
-		$temp = floor(($y / 100 + 1) * 3 / 4);
-		return $num + floor($y / 4) - $temp;
-	}
-
-	private static function calc_weekday($daynr, $sunday_first_day_of_week) {
-	  $ret = floor(($daynr + 5 + ($sunday_first_day_of_week ? 1 : 0)) % 7);
-	  return $ret;
-	}
-
-	private static function calc_days_in_year($year)
-	{
-	  return (($year & 3) == 0 && ($year%100 || ($year%400 == 0 && $year)) ? 366 : 365);
-	}
-
-	private static function week_mode($mode) {
-		$week_format= ($mode & 7);
-		if (!($week_format & self::WEEK_MONDAY_FIRST)) {
-			$week_format^= self::WEEK_FIRST_WEEKDAY;
-		}
-		return $week_format;
-	}
-
-
-	private static function calc_week($year, $month, $day, $week_behaviour, &$calc_year) {
-		$daynr=self::calc_daynr($year,$month,$day);
-		$first_daynr=self::calc_daynr($year,1,1);
-		$monday_first= ($week_behaviour & self::WEEK_MONDAY_FIRST) ? 1 : 0;
-		$week_year= ($week_behaviour & self::WEEK_YEAR) ? 1 : 0;
-		$first_weekday= ($week_behaviour & self::WEEK_FIRST_WEEKDAY) ? 1 : 0;
-
-		$weekday=self::calc_weekday($first_daynr, !$monday_first);
-		$calc_year=$year;
-
-		if ($month == 1 && $day <= 7-$weekday)
-		{
-			if (!$week_year && (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)))
-				return 0;
-			$week_year= 1;
-			$calc_year--;
-			$first_daynr-= ($days=self::calc_days_in_year($calc_year));
-			$weekday= ($weekday + 53*7- $days) % 7;
-	  }
-
-	  if (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)) {
-		$days= $daynr - ($first_daynr+ (7-$weekday));
-	  }
-	  else {
-		$days= $daynr - ($first_daynr - $weekday);
-	  }
-
-	  if ($week_year && $days >= 52*7)
-	  {
-		$weekday= ($weekday + self::calc_days_in_year($calc_year)) % 7;
-		if ((!$first_weekday && $weekday < 4) || ($first_weekday && $weekday == 0))
-		{
-		  $calc_year++;
-		  return 1;
-		}
-	  }
-	  return floor($days/7+1);
-	}
-
 }
 
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
new file mode 100644
index 00000000000..f232acb199e
--- /dev/null
+++ b/htdocs/core/db/sqlite3.class.php
@@ -0,0 +1,1478 @@
+<?php
+/* Copyright (C) 2001      Fabien Seisen        <seisen@linuxfr.org>
+ * Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
+ * Copyright (C) 2005-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/db/sqlite.class.php
+ *	\brief      Class file to manage Dolibarr database access for a Sqlite database
+ */
+
+require_once DOL_DOCUMENT_ROOT .'/core/db/DoliDB.class.php';
+
+/**
+ *	Class to manage Dolibarr database access for a Sqlite database
+ */
+class DoliDBSqlite3 extends DoliDB
+{
+    //! Database type
+    public $type='sqlite3';
+    //! Database label
+    const LABEL='Sqlite3';
+    //! Version min database
+    const VERSIONMIN='3.0.0';
+	//! Resultset of last query
+	private $_results;
+
+	const WEEK_MONDAY_FIRST=1;
+	const WEEK_YEAR = 2;
+	const WEEK_FIRST_WEEKDAY=4;
+
+
+    /**
+	 *	Constructor.
+	 *	This create an opened connexion to a database server and eventually to a database
+	 *
+	 *	@param      string	$type		Type of database (mysql, pgsql...)
+	 *	@param	    string	$host		Address of database server
+	 *	@param	    string	$user		Nom de l'utilisateur autorise
+	 *	@param	    string	$pass		Mot de passe
+	 *	@param	    string	$name		Nom de la database
+	 *	@param	    int		$port		Port of database server
+     */
+    function __construct($type, $host, $user, $pass, $name='', $port=0)
+    {
+        global $conf,$langs;
+
+        // Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
+        if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
+        if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation;
+
+        $this->database_user=$user;
+        $this->database_host=$host;
+        $this->database_port=$port;
+
+        $this->transaction_opened=0;
+
+        //print "Name DB: $host,$user,$pass,$name<br>";
+
+        /*if (! function_exists("sqlite_query"))
+        {
+            $this->connected = 0;
+            $this->ok = 0;
+            $this->error="Sqlite PHP functions for using Sqlite driver are not available in this version of PHP. Try to use another driver.";
+            dol_syslog(get_class($this)."::DoliDBSqlite3 : Sqlite PHP functions for using Sqlite driver are not available in this version of PHP. Try to use another driver.",LOG_ERR);
+            return $this->ok;
+        }*/
+
+        /*if (! $host)
+        {
+            $this->connected = 0;
+            $this->ok = 0;
+            $this->error=$langs->trans("ErrorWrongHostParameter");
+            dol_syslog(get_class($this)."::DoliDBSqlite3 : Erreur Connect, wrong host parameters",LOG_ERR);
+            return $this->ok;
+        }*/
+
+        // Essai connexion serveur
+        // We do not try to connect to database, only to server. Connect to database is done later in constrcutor
+        $this->db = $this->connect($host, $user, $pass, $name, $port);
+
+        if ($this->db)
+        {
+            $this->connected = 1;
+            $this->ok = 1;
+            $this->database_selected = 1;
+            $this->database_name = $name;
+
+			$this->addCustomFunction('IF');
+			$this->addCustomFunction('MONTH');
+			$this->addCustomFunction('CURTIME');
+			$this->addCustomFunction('CURDATE');
+			$this->addCustomFunction('WEEK', 1);
+			$this->addCustomFunction('WEEK', 2);
+			$this->addCustomFunction('WEEKDAY');
+			$this->addCustomFunction('date_format');
+            //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        }
+        else
+        {
+            // host, login ou password incorrect
+            $this->connected = 0;
+            $this->ok = 0;
+            $this->database_selected = 0;
+            $this->database_name = '';
+            //$this->error=sqlite_connect_error();
+            dol_syslog(get_class($this)."::DoliDBSqlite3 : Error Connect ".$this->error,LOG_ERR);
+        }
+
+        return $this->ok;
+    }
+
+
+    /**
+     *  Convert a SQL request in Mysql syntax to native syntax
+     *
+     *  @param     string	$line   SQL request line to convert
+     *  @param     string	$type	Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+     *  @return    string   		SQL request line converted
+     */
+    static function convertSQLFromMysql($line,$type='ddl')
+    {
+		// Removed empty line if this is a comment line for SVN tagging
+		if (preg_match('/^--\s\$Id/i',$line)) {
+			return '';
+		}
+		// Return line if this is a comment
+		if (preg_match('/^#/i',$line) || preg_match('/^$/i',$line) || preg_match('/^--/i',$line))
+		{
+			return $line;
+		}
+		if ($line != "")
+		{
+		    if ($type == 'auto')
+		    {
+              if (preg_match('/ALTER TABLE/i',$line)) $type='dml';
+              else if (preg_match('/CREATE TABLE/i',$line)) $type='dml';
+              else if (preg_match('/DROP TABLE/i',$line)) $type='dml';
+		    }
+
+		    if ($type == 'dml')
+		    {
+                $line=preg_replace('/\s/',' ',$line);   // Replace tabulation with space
+
+		        // we are inside create table statement so lets process datatypes
+    			if (preg_match('/(ISAM|innodb)/i',$line)) { // end of create table sequence
+    				$line=preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb);/i',');',$line);
+    				$line=preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb);/i',');',$line);
+    				$line=preg_replace('/,$/','',$line);
+    			}
+
+    			// Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
+    			if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i',$line,$reg)) {
+    				$newline=preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i','\\1 \\2 integer PRIMARY KEY AUTOINCREMENT',$line);
+                    //$line = "-- ".$line." replaced by --\n".$newline;
+                    $line=$newline;
+    			}
+
+    			// tinyint type conversion
+    			$line=str_replace('tinyint','smallint',$line);
+
+    			// nuke unsigned
+    			$line=preg_replace('/(int\w+|smallint)\s+unsigned/i','\\1',$line);
+
+    			// blob -> text
+    			$line=preg_replace('/\w*blob/i','text',$line);
+
+    			// tinytext/mediumtext -> text
+    			$line=preg_replace('/tinytext/i','text',$line);
+    			$line=preg_replace('/mediumtext/i','text',$line);
+
+    			// change not null datetime field to null valid ones
+    			// (to support remapping of "zero time" to null
+    			$line=preg_replace('/datetime not null/i','datetime',$line);
+    			$line=preg_replace('/datetime/i','timestamp',$line);
+
+    			// double -> numeric
+    			$line=preg_replace('/^double/i','numeric',$line);
+    			$line=preg_replace('/(\s*)double/i','\\1numeric',$line);
+    			// float -> numeric
+    			$line=preg_replace('/^float/i','numeric',$line);
+    			$line=preg_replace('/(\s*)float/i','\\1numeric',$line);
+
+    			// unique index(field1,field2)
+    			if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i',$line))
+    			{
+    				$line=preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i','UNIQUE\(\\1\)',$line);
+    			}
+
+    			// We remove end of requests "AFTER fieldxxx"
+    			$line=preg_replace('/AFTER [a-z0-9_]+/i','',$line);
+
+    			// We remove start of requests "ALTER TABLE tablexxx" if this is a DROP INDEX
+    			$line=preg_replace('/ALTER TABLE [a-z0-9_]+ DROP INDEX/i','DROP INDEX',$line);
+
+                // Translate order to rename fields
+                if (preg_match('/ALTER TABLE ([a-z0-9_]+) CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i',$line,$reg))
+                {
+                	$line = "-- ".$line." replaced by --\n";
+                    $line.= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
+                }
+
+                // Translate order to modify field format
+                if (preg_match('/ALTER TABLE ([a-z0-9_]+) MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i',$line,$reg))
+                {
+                    $line = "-- ".$line." replaced by --\n";
+                    $newreg3=$reg[3];
+                    $newreg3=preg_replace('/ DEFAULT NULL/i','',$newreg3);
+                    $newreg3=preg_replace('/ NOT NULL/i','',$newreg3);
+                    $newreg3=preg_replace('/ NULL/i','',$newreg3);
+                    $newreg3=preg_replace('/ DEFAULT 0/i','',$newreg3);
+                    $newreg3=preg_replace('/ DEFAULT \'[0-9a-zA-Z_@]*\'/i','',$newreg3);
+                    $line.= "ALTER TABLE ".$reg[1]." ALTER COLUMN ".$reg[2]." TYPE ".$newreg3;
+                    // TODO Add alter to set default value or null/not null if there is this in $reg[3]
+                }
+
+                // alter table add primary key (field1, field2 ...) -> We create a unique index instead as dynamic creation of primary key is not supported
+    			// ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity);
+    			if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i',$line,$reg))
+    			{
+    				$line = "-- ".$line." replaced by --\n";
+    				$line.= "CREATE UNIQUE INDEX ".$reg[2]." ON ".$reg[1]."(".$reg[3];
+    			}
+
+                // Translate order to drop foreign keys
+                // ALTER TABLE llx_dolibarr_modules DROP FOREIGN KEY fk_xxx;
+                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i',$line,$reg))
+                {
+                    $line = "-- ".$line." replaced by --\n";
+                    $line.= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
+                }
+
+    			// alter table add [unique] [index] (field1, field2 ...)
+    			// ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
+    			if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i',$line,$reg))
+    			{
+    				$fieldlist=$reg[4];
+    				$idxname=$reg[3];
+    				$tablename=$reg[1];
+    				$line = "-- ".$line." replaced by --\n";
+    				$line.= "CREATE ".(preg_match('/UNIQUE/',$reg[2])?'UNIQUE ':'')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
+    			}
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i',$line, $reg)) {
+					// Pour l'instant les contraintes ne sont pas créées
+					dol_syslog(get_class().'::query line emptied');
+					$line = 'SELECT 0;';
+
+				}
+
+				//if (preg_match('/rowid\s+.*\s+PRIMARY\s+KEY,/i', $line)) {
+					//preg_replace('/(rowid\s+.*\s+PRIMARY\s+KEY\s*,)/i', '/* \\1 */', $line);
+				//}
+            }
+
+			// Delete using criteria on other table must not declare twice the deleted table
+			// DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable
+			if (preg_match('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i',$line,$reg))
+			{
+				if ($reg[1] == $reg[2])	// If same table, we remove second one
+				{
+					$line=preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i','DELETE FROM \\1 USING \\3', $line);
+				}
+			}
+
+			// Remove () in the tables in FROM if one table
+			$line=preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i','FROM \\1',$line);
+			//print $line."\n";
+
+			// Remove () in the tables in FROM if two table
+			$line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2',$line);
+			//print $line."\n";
+
+			// Remove () in the tables in FROM if two table
+			$line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2, \\3',$line);
+			//print $line."\n";
+
+			//print "type=".$type." newline=".$line."<br>\n";
+		}
+
+		return $line;
+    }
+
+	/**
+	 *	Select a database
+	 *
+	 *	@param	    string	$database	Name of database
+	 *	@return	    boolean  		    true if OK, false if KO
+	 */
+    function select_db($database)
+    {
+        dol_syslog(get_class($this)."::select_db database=".$database, LOG_DEBUG);
+        return sqlite_select_db($this->db,$database);
+    }
+
+
+    /**
+	 *	Connexion to server
+	 *
+	 *	@param	    string	$host		database server host
+	 *	@param	    string	$login		login
+	 *	@param	    string	$passwd		password
+	 *	@param		string	$name		name of database (not used for mysql, used for pgsql)
+	 *	@param		string	$port		Port of database server
+	 *	@return		resource			Database access handler
+	 *	@see		close
+     */
+    function connect($host, $login, $passwd, $name, $port=0)
+    {
+        global $conf,$main_data_dir;
+
+        dol_syslog(get_class($this)."::connect name=".$name,LOG_DEBUG);
+
+        $dir=$main_data_dir;
+        if (empty($dir)) $dir=DOL_DATA_ROOT;
+        // With sqlite, port must be in connect parameters
+        //if (! $newport) $newport=3306;
+		$database_name = $dir.'/database_'.$name.'.sdb';
+        try {
+            /*** connect to SQLite database ***/
+            //$this->db = new PDO("sqlite:".$dir.'/database_'.$name.'.sdb');
+			$this->db = new SQLite3($database_name);
+            //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        }
+        catch(Exception $e)
+        {
+            $this->error=  self::LABEL.' '.$e->getMessage().' current dir='.$database_name;
+            return '';
+        }
+
+        //print "Resultat fonction connect: ".$this->db;
+        return $this->db;
+    }
+
+
+    /**
+	 *	Return version of database server
+	 *
+	 *	@return	        string      Version string
+     */
+    function getVersion()
+    {
+		return $this->db->version()['versionString'];
+    }
+
+    /**
+     *	Return version of database client driver
+     *
+     *	@return	        string      Version string
+     */
+    function getDriverInfo()
+    {
+	    // FIXME: Dummy method
+	    // TODO: Implement
+
+    	return '';
+    }
+
+
+    /**
+     *  Close database connexion
+     *
+     *  @return     boolean     True if disconnect successfull, false otherwise
+     *  @see        connect
+     */
+    function close()
+    {
+        if ($this->db)
+        {
+	        if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+            $this->connected=0;
+			$this->db->close();
+            $this->db=null;    // Clean this->db
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 	Execute a SQL request and return the resultset
+     *
+     * 	@param	string	$query			SQL query string
+     * 	@param	int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
+     * 									Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
+     *  @param  string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
+     *	@return	resource    			Resultset of answer
+     */
+    function query($query,$usesavepoint=0,$type='auto')
+    {
+        $errmsg='';
+
+        $ret='';
+        $query = trim($query);
+        $this->error = 0;
+
+		// Convert MySQL syntax to SQLite syntax
+		if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i',$query, $reg)) {
+			// Ajout d'une clef étrangère à la table
+			// procédure de remplacement de la table pour ajouter la contrainte
+			// Exemple : ALTER TABLE llx_adherent ADD CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid)
+			// -> CREATE TABLE ( ... ,CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid))
+			$foreignFields = $reg[5];
+			$foreignTable = $reg[4];
+			$localfields = $reg[3];
+			$constraintname=trim($reg[2]);
+			$tablename=trim($reg[1]);
+
+			$descTable = $this->db->querySingle("SELECT sql FROM sqlite_master WHERE name='" . $tablename . "'");
+
+			// 1- Renommer la table avec un nom temporaire
+			$this->query('ALTER TABLE ' . $tablename . ' RENAME TO tmp_' . $tablename);
+
+			// 2- Recréer la table avec la contrainte ajoutée
+
+			// on bricole la requete pour ajouter la contrainte
+			$descTable = substr($descTable, 0, strlen($descTable) - 1);
+			$descTable .= ", CONSTRAINT " . $constraintname . " FOREIGN KEY (" . $localfields . ") REFERENCES " .$foreignTable . "(" . $foreignFields . ")";
+
+			// fermeture de l'instruction
+			$descTable .= ')';
+
+			// Création proprement dite de la table
+			$this->query($descTable);
+
+			// 3- Transférer les données
+			$this->query('INSERT INTO ' . $tablename . ' SELECT * FROM tmp_' . $tablename);
+
+			// 4- Supprimer la table temporaire
+			$this->query('DROP TABLE tmp_' . $tablename);
+
+			// dummy statement
+			$query="SELECT 0";
+
+		} else {
+			$query=$this->convertSQLFromMysql($query,$type);
+		}
+		//print "After convertSQLFromMysql:\n".$query."<br>\n";
+
+	    dol_syslog('sql='.$query, LOG_DEBUG);
+
+	    // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
+        try {
+            //$ret = $this->db->exec($query);
+            $ret = $this->db->query($query);        // $ret is a PDO object
+			if ($ret) {
+				$ret->queryString = $query;
+			}
+        }
+        catch(Exception $e)
+        {
+            $this->error=$this->db->lastErrorMsg();
+        }
+
+        if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query))
+        {
+            // Si requete utilisateur, on la sauvegarde ainsi que son resultset
+            if (! is_object($ret) || $this->error)
+            {
+                $this->lastqueryerror = $query;
+                $this->lasterror = $this->error();
+                $this->lasterrno = $this->errno();
+
+	            dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
+
+	            $errormsg = get_class($this)."::query SQL Error message: ".$this->lasterror;
+
+				if (preg_match('/[0-9]/',$this->lasterrno)) {
+                    $errormsg .= ' ('.$this->lasterrno.')';
+                }
+
+	            dol_syslog($errormsg, LOG_ERR);
+            }
+            $this->lastquery=$query;
+            $this->_results = $ret;
+        }
+
+        return $ret;
+    }
+
+    /**
+     *	Renvoie la ligne courante (comme un objet) pour le curseur resultset
+     *
+     *	@param	Resultset	$resultset  Curseur de la requete voulue
+     *	@return	Object					Object result line or false if KO or end of cursor
+     */
+    function fetch_object($resultset)
+    {
+        // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
+        if (! is_object($resultset)) { $resultset=$this->_results; }
+        //return $resultset->fetch(PDO::FETCH_OBJ);
+		$ret = $resultset->fetchArray(SQLITE3_ASSOC);
+		if ($ret) {
+			return (object)$ret;
+		}
+    }
+
+
+    /**
+     *	Return datas as an array
+     *
+     *	@param	Resultset	$resultset  Resultset of request
+     *	@return	array					Array
+     */
+    function fetch_array($resultset)
+    {
+        // If resultset not provided, we take the last used by connexion
+        if (! is_object($resultset)) { $resultset=$this->_results; }
+        //return $resultset->fetch(PDO::FETCH_ASSOC);
+		$ret = $resultset->fetchArray(SQLITE3_ASSOC);
+		if ($ret) {
+			return (array)$ret;
+		}
+    }
+
+    /**
+     *	Return datas as an array
+     *
+     *	@param	Resultset	$resultset  Resultset of request
+     *	@return	array					Array
+     */
+    function fetch_row($resultset)
+    {
+        // If resultset not provided, we take the last used by connexion
+        if (! is_bool($resultset))
+        {
+            if (! is_object($resultset)) { $resultset=$this->_results; }
+            return $resultset->fetchArray(SQLITE3_NUM);
+        }
+        else
+        {
+            // si le curseur est un booleen on retourne la valeur 0
+            return 0;
+        }
+    }
+
+    /**
+     *	Return number of lines for result of a SELECT
+     *
+     *	@param	Resultset	$resultset  Resulset of requests
+     *	@return int		    			Nb of lines
+     *	@see    affected_rows
+     */
+    function num_rows($resultset)
+    {
+        // If resultset not provided, we take the last used by connexion
+        if (! is_object($resultset)) { $resultset=$this->_results; }
+		if (preg_match("/^SELECT/i", $resultset->queryString)) {
+			return $this->db->querySingle("SELECT count(*) FROM (" . $resultset->queryString . ") q");
+		}
+		return 0;
+    }
+
+    /**
+     *	Return number of lines for result of a SELECT
+     *
+     *	@param	Resultset	$resultset  Resulset of requests
+     *	@return int		    			Nb of lines
+     *	@see    affected_rows
+     */
+    function affected_rows($resultset)
+    {
+        // If resultset not provided, we take the last used by connexion
+        if (! is_object($resultset)) { $resultset=$this->_results; }
+		if (preg_match("/^SELECT/i", $resultset->queryString)) {
+			return $this->num_rows($resultset);
+		}
+        // mysql necessite un link de base pour cette fonction contrairement
+        // a pqsql qui prend un resultset
+        return $this->db->changes();
+    }
+
+
+	/**
+	 *	Free last resultset used.
+	 *
+	 *	@param  resultset	$resultset   Curseur de la requete voulue
+	 *	@return	void
+	 */
+    function free($resultset=0)
+    {
+        // If resultset not provided, we take the last used by connexion
+        if (! is_object($resultset)) { $resultset=$this->_results; }
+        // Si resultset en est un, on libere la memoire
+        if ($resultset && is_object($resultset)) $resultset->finalize();
+    }
+
+	/**
+	 *	Escape a string to insert data
+	 *
+	 *  @param	string	$stringtoencode		String to escape
+	 *  @return	string						String escaped
+	 */
+    function escape($stringtoencode)
+    {
+		return Sqlite3::escapeString($stringtoencode);
+    }
+
+    /**
+     *	Renvoie le code erreur generique de l'operation precedente.
+     *
+     *	@return	string		Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...)
+     */
+    function errno()
+    {
+        if (! $this->connected) {
+            // Si il y a eu echec de connexion, $this->db n'est pas valide.
+            return 'DB_ERROR_FAILED_TO_CONNECT';
+        }
+        else {
+            // Constants to convert error code to a generic Dolibarr error code
+            /*$errorcode_map = array(
+            1004 => 'DB_ERROR_CANNOT_CREATE',
+            1005 => 'DB_ERROR_CANNOT_CREATE',
+            1006 => 'DB_ERROR_CANNOT_CREATE',
+            1007 => 'DB_ERROR_ALREADY_EXISTS',
+            1008 => 'DB_ERROR_CANNOT_DROP',
+            1025 => 'DB_ERROR_NO_FOREIGN_KEY_TO_DROP',
+            1044 => 'DB_ERROR_ACCESSDENIED',
+            1046 => 'DB_ERROR_NODBSELECTED',
+            1048 => 'DB_ERROR_CONSTRAINT',
+            'HY000' => 'DB_ERROR_TABLE_ALREADY_EXISTS',
+            1051 => 'DB_ERROR_NOSUCHTABLE',
+            1054 => 'DB_ERROR_NOSUCHFIELD',
+            1060 => 'DB_ERROR_COLUMN_ALREADY_EXISTS',
+            1061 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
+            1062 => 'DB_ERROR_RECORD_ALREADY_EXISTS',
+            1064 => 'DB_ERROR_SYNTAX',
+            1068 => 'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS',
+            1075 => 'DB_ERROR_CANT_DROP_PRIMARY_KEY',
+            1091 => 'DB_ERROR_NOSUCHFIELD',
+            1100 => 'DB_ERROR_NOT_LOCKED',
+            1136 => 'DB_ERROR_VALUE_COUNT_ON_ROW',
+            1146 => 'DB_ERROR_NOSUCHTABLE',
+            1216 => 'DB_ERROR_NO_PARENT',
+            1217 => 'DB_ERROR_CHILD_EXISTS',
+            1451 => 'DB_ERROR_CHILD_EXISTS'
+            );
+
+            if (isset($errorcode_map[$this->db->errorCode()]))
+            {
+                return $errorcode_map[$this->db->errorCode()];
+            }*/
+            $errno=$this->db->lastErrorCode();
+			if ($errno=='HY000' || $errno == 0)
+			{
+                if (preg_match('/table.*already exists/i',$this->error))     return 'DB_ERROR_TABLE_ALREADY_EXISTS';
+                elseif (preg_match('/index.*already exists/i',$this->error)) return 'DB_ERROR_KEY_NAME_ALREADY_EXISTS';
+                elseif (preg_match('/syntax error/i',$this->error))          return 'DB_ERROR_SYNTAX';
+			}
+			if ($errno=='23000')
+			{
+                if (preg_match('/column.* not unique/i',$this->error))       return 'DB_ERROR_RECORD_ALREADY_EXISTS';
+                elseif (preg_match('/PRIMARY KEY must be unique/i',$this->error)) return 'DB_ERROR_RECORD_ALREADY_EXISTS';
+			}
+			if ($errno > 1) {
+				// TODO Voir la liste des messages d'erreur
+			}
+
+            return ($errno?'DB_ERROR_'.$errno:'0');
+        }
+    }
+
+    /**
+     *	Renvoie le texte de l'erreur mysql de l'operation precedente.
+     *
+     *	@return	string	Error text
+     */
+    function error()
+    {
+        if (! $this->connected) {
+            // Si il y a eu echec de connexion, $this->db n'est pas valide pour sqlite_error.
+            return 'Not connected. Check setup parameters in conf/conf.php file and your sqlite version';
+        }
+        else {
+            return $this->error;
+        }
+    }
+
+    /**
+	 * Get last ID after an insert INSERT
+	 *
+	 * @param   string	$tab    	Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
+	 * @param	string	$fieldid	Field name
+	 * @return  int     			Id of row
+     */
+    function last_insert_id($tab,$fieldid='rowid')
+    {
+        return $this->db->lastInsertRowId();
+    }
+
+    /**
+     *  Encrypt sensitive data in database
+     *  Warning: This function includes the escape, so it must use direct value
+     *
+     *  @param  string  $fieldorvalue   Field name or value to encrypt
+     *  @param	int		$withQuotes     Return string with quotes
+     *  @return return          		XXX(field) or XXX('value') or field or 'value'
+     */
+    function encrypt($fieldorvalue, $withQuotes=0)
+    {
+        global $conf;
+
+        // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
+        $cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
+
+        //Encryption key
+        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+
+        $return = ($withQuotes?"'":"").$this->escape($fieldorvalue).($withQuotes?"'":"");
+
+        if ($cryptType && !empty($cryptKey))
+        {
+            if ($cryptType == 2)
+            {
+                $return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
+            }
+            else if ($cryptType == 1)
+            {
+                $return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     *	Decrypt sensitive data in database
+     *
+     *	@param	string	$value			Value to decrypt
+     * 	@return	string					Decrypted value if used
+     */
+    function decrypt($value)
+    {
+        global $conf;
+
+        // Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
+        $cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
+
+        //Encryption key
+        $cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
+
+        $return = $value;
+
+        if ($cryptType && !empty($cryptKey))
+        {
+            if ($cryptType == 2)
+            {
+                $return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
+            }
+            else if ($cryptType == 1)
+            {
+                $return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
+            }
+        }
+
+        return $return;
+    }
+
+
+    /**
+	 * Return connexion ID
+	 *
+	 * @return	        string      Id connexion
+     */
+    function DDLGetConnectId()
+    {
+		return '?';
+    }
+
+
+    /**
+	 *	Create a new database
+	 *	Do not use function xxx_create_db (xxx=mysql, ...) as they are deprecated
+	 *	We force to create database with charset this->forcecharset and collate this->forcecollate
+	 *
+	 *	@param	string	$database		Database name to create
+	 * 	@param	string	$charset		Charset used to store data
+	 * 	@param	string	$collation		Charset used to sort data
+	 * 	@param	string	$owner			Username of database owner
+	 * 	@return	resource				resource defined if OK, null if KO
+     */
+    function DDLCreateDb($database,$charset='',$collation='',$owner='')
+    {
+        if (empty($charset))   $charset=$this->forcecharset;
+        if (empty($collation)) $collation=$this->forcecollate;
+
+        // ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
+        $sql = 'CREATE DATABASE '.$database;
+        $sql.= ' DEFAULT CHARACTER SET '.$charset.' DEFAULT COLLATE '.$collation;
+
+        dol_syslog($sql,LOG_DEBUG);
+        $ret=$this->query($sql);
+        if (! $ret)
+        {
+            // We try again for compatibility with Mysql < 4.1.1
+            $sql = 'CREATE DATABASE '.$database;
+            $ret=$this->query($sql);
+            dol_syslog($sql,LOG_DEBUG);
+        }
+        return $ret;
+    }
+
+    /**
+	 *  List tables into a database
+	 *
+	 *  @param	string		$database	Name of database
+	 *  @param	string		$table		Name of table filter ('xxx%')
+	 *  @return	array					List of tables in an array
+     */
+    function DDLListTables($database, $table='')
+    {
+        $listtables=array();
+
+        $like = '';
+        if ($table) $like = "LIKE '".$table."'";
+        $sql="SHOW TABLES FROM ".$database." ".$like.";";
+        //print $sql;
+        $result = $this->query($sql);
+        while($row = $this->fetch_row($result))
+        {
+            $listtables[] = $row[0];
+        }
+        return $listtables;
+    }
+
+    /**
+	 *	List information of columns into a table.
+	 *
+	 *	@param	string	$table		Name of table
+	 *	@return	array				Tableau des informations des champs de la table
+	 *	TODO modify for sqlite
+     */
+    function DDLInfoTable($table)
+    {
+        $infotables=array();
+
+        $sql="SHOW FULL COLUMNS FROM ".$table.";";
+
+        dol_syslog($sql,LOG_DEBUG);
+        $result = $this->query($sql);
+        while($row = $this->fetch_row($result))
+        {
+            $infotables[] = $row;
+        }
+        return $infotables;
+    }
+
+    /**
+	 *	Create a table into database
+	 *
+	 *	@param	    string	$table 			Nom de la table
+	 *	@param	    array	$fields 		Tableau associatif [nom champ][tableau des descriptions]
+	 *	@param	    string	$primary_key 	Nom du champ qui sera la clef primaire
+	 *	@param	    string	$type 			Type de la table
+	 *	@param	    array	$unique_keys 	Tableau associatifs Nom de champs qui seront clef unique => valeur
+	 *	@param	    array	$fulltext_keys	Tableau des Nom de champs qui seront indexes en fulltext
+	 *	@param	    string	$keys 			Tableau des champs cles noms => valeur
+	 *	@return	    int						<0 if KO, >=0 if OK
+     */
+    function DDLCreateTable($table,$fields,$primary_key,$type,$unique_keys="",$fulltext_keys="",$keys="")
+    {
+        // cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
+        // ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
+        $sql = "create table ".$table."(";
+        $i=0;
+        foreach($fields as $field_name => $field_desc)
+        {
+            $sqlfields[$i] = $field_name." ";
+            $sqlfields[$i]  .= $field_desc['type'];
+            if( preg_match("/^[^\s]/i",$field_desc['value']))
+            $sqlfields[$i]  .= "(".$field_desc['value'].")";
+            else if( preg_match("/^[^\s]/i",$field_desc['attribute']))
+            $sqlfields[$i]  .= " ".$field_desc['attribute'];
+            else if( preg_match("/^[^\s]/i",$field_desc['default']))
+            {
+                if(preg_match("/null/i",$field_desc['default']))
+                $sqlfields[$i]  .= " default ".$field_desc['default'];
+                else
+                $sqlfields[$i]  .= " default '".$field_desc['default']."'";
+            }
+            else if( preg_match("/^[^\s]/i",$field_desc['null']))
+            $sqlfields[$i]  .= " ".$field_desc['null'];
+
+            else if( preg_match("/^[^\s]/i",$field_desc['extra']))
+            $sqlfields[$i]  .= " ".$field_desc['extra'];
+            $i++;
+        }
+        if($primary_key != "")
+        $pk = "primary key(".$primary_key.")";
+
+        if($unique_keys != "")
+        {
+            $i = 0;
+            foreach($unique_keys as $key => $value)
+            {
+                $sqluq[$i] = "UNIQUE KEY '".$key."' ('".$value."')";
+                $i++;
+            }
+        }
+        if($keys != "")
+        {
+            $i = 0;
+            foreach($keys as $key => $value)
+            {
+                $sqlk[$i] = "KEY ".$key." (".$value.")";
+                $i++;
+            }
+        }
+        $sql .= implode(',',$sqlfields);
+        if($primary_key != "")
+        $sql .= ",".$pk;
+        if($unique_keys != "")
+        $sql .= ",".implode(',',$sqluq);
+        if($keys != "")
+        $sql .= ",".implode(',',$sqlk);
+        $sql .=") type=".$type;
+
+        dol_syslog($sql,LOG_DEBUG);
+        if(! $this -> query($sql))
+        return -1;
+        else
+        return 1;
+    }
+
+    /**
+	 *	Return a pointer of line with description of a table or field
+	 *
+	 *	@param	string		$table	Name of table
+	 *	@param	string		$field	Optionnel : Name of field if we want description of field
+	 *	@return	resource			Resource
+     */
+    function DDLDescTable($table,$field="")
+    {
+        $sql="DESC ".$table." ".$field;
+
+        dol_syslog(get_class($this)."::DDLDescTable ".$sql,LOG_DEBUG);
+        $this->_results = $this->query($sql);
+        return $this->_results;
+    }
+
+    /**
+	 *	Create a new field into table
+	 *
+	 *	@param	string	$table 				Name of table
+	 *	@param	string	$field_name 		Name of field to add
+	 *	@param	string	$field_desc 		Tableau associatif de description du champ a inserer[nom du parametre][valeur du parametre]
+	 *	@param	string	$field_position 	Optionnel ex.: "after champtruc"
+	 *	@return	int							<0 if KO, >0 if OK
+     */
+    function DDLAddField($table,$field_name,$field_desc,$field_position="")
+    {
+        // cles recherchees dans le tableau des descriptions (field_desc) : type,value,attribute,null,default,extra
+        // ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
+        $sql= "ALTER TABLE ".$table." ADD ".$field_name." ";
+        $sql.= $field_desc['type'];
+        if(preg_match("/^[^\s]/i",$field_desc['value']))
+        if (! in_array($field_desc['type'],array('date','datetime')))
+        {
+            $sql.= "(".$field_desc['value'].")";
+        }
+        if(preg_match("/^[^\s]/i",$field_desc['attribute']))
+        $sql.= " ".$field_desc['attribute'];
+        if(preg_match("/^[^\s]/i",$field_desc['null']))
+        $sql.= " ".$field_desc['null'];
+        if(preg_match("/^[^\s]/i",$field_desc['default']))
+        {
+            if(preg_match("/null/i",$field_desc['default']))
+            $sql.= " default ".$field_desc['default'];
+            else
+            $sql.= " default '".$field_desc['default']."'";
+        }
+        if(preg_match("/^[^\s]/i",$field_desc['extra']))
+        $sql.= " ".$field_desc['extra'];
+        $sql.= " ".$field_position;
+
+        dol_syslog(get_class($this)."::DDLAddField ".$sql,LOG_DEBUG);
+        if(! $this->query($sql))
+        {
+            return -1;
+        }
+        else
+        {
+            return 1;
+        }
+    }
+
+    /**
+	 *	Update format of a field into a table
+	 *
+	 *	@param	string	$table 				Name of table
+	 *	@param	string	$field_name 		Name of field to modify
+	 *	@param	string	$field_desc 		Array with description of field format
+	 *	@return	int							<0 if KO, >0 if OK
+     */
+    function DDLUpdateField($table,$field_name,$field_desc)
+    {
+        $sql = "ALTER TABLE ".$table;
+        $sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
+        if ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
+        	$sql.="(".$field_desc['value'].")";
+        }
+
+        dol_syslog(get_class($this)."::DDLUpdateField ".$sql,LOG_DEBUG);
+        if (! $this->query($sql))
+        return -1;
+        else
+        return 1;
+    }
+
+    /**
+	 *	Drop a field from table
+	 *
+	 *	@param	string	$table 			Name of table
+	 *	@param	string	$field_name 	Name of field to drop
+	 *	@return	int						<0 if KO, >0 if OK
+     */
+    function DDLDropField($table,$field_name)
+    {
+        $sql= "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
+        dol_syslog(get_class($this)."::DDLDropField ".$sql,LOG_DEBUG);
+        if (! $this->query($sql))
+        {
+            $this->error=$this->lasterror();
+            return -1;
+        }
+        else return 1;
+    }
+
+
+    /**
+	 * 	Create a user and privileges to connect to database (even if database does not exists yet)
+	 *
+	 *	@param	string	$dolibarr_main_db_host 		Ip serveur
+	 *	@param	string	$dolibarr_main_db_user 		Nom user a creer
+	 *	@param	string	$dolibarr_main_db_pass 		Mot de passe user a creer
+	 *	@param	string	$dolibarr_main_db_name		Database name where user must be granted
+	 *	@return	int									<0 if KO, >=0 if OK
+     */
+    function DDLCreateUser($dolibarr_main_db_host,$dolibarr_main_db_user,$dolibarr_main_db_pass,$dolibarr_main_db_name)
+    {
+        $sql = "INSERT INTO user ";
+        $sql.= "(Host,User,password,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
+        $sql.= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_user)."',password('".addslashes($dolibarr_main_db_pass)."')";
+        $sql.= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
+
+        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);	// No sql to avoid password in log
+        $resql=$this->query($sql);
+        if (! $resql)
+        {
+            return -1;
+        }
+
+        $sql = "INSERT INTO db ";
+        $sql.= "(Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv,Index_Priv,Alter_priv,Lock_tables_priv)";
+        $sql.= " VALUES ('".$this->escape($dolibarr_main_db_host)."','".$this->escape($dolibarr_main_db_name)."','".addslashes($dolibarr_main_db_user)."'";
+        $sql.= ",'Y','Y','Y','Y','Y','Y','Y','Y','Y')";
+
+        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
+        $resql=$this->query($sql);
+        if (! $resql)
+        {
+            return -1;
+        }
+
+        $sql="FLUSH Privileges";
+
+        dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
+        $resql=$this->query($sql);
+        if (! $resql)
+        {
+            return -1;
+        }
+
+        return 1;
+    }
+
+	/**
+	 *	Return charset used to store data in database
+	 *
+	 *	@return		string		Charset
+	 */
+    function getDefaultCharacterSetDatabase()
+    {
+        return 'UTF-8';
+    }
+
+	/**
+	 *	Return list of available charset that can be used to store data in database
+	 *
+	 *	@return		array		List of Charset
+	 */
+    function getListOfCharacterSet()
+    {
+        $liste = array();
+        $i=0;
+        $liste[$i]['charset'] = 'UTF-8';
+        $liste[$i]['description'] = 'UTF-8';
+        return $liste;
+    }
+
+	/**
+	 *	Return collation used in database
+	 *
+	 *	@return		string		Collation value
+	 */
+    function getDefaultCollationDatabase()
+    {
+        return 'UTF-8';
+    }
+
+	/**
+	 *	Return list of available collation that can be used for database
+	 *
+	 *	@return		array		List of Collation
+	 */
+    function getListOfCollation()
+    {
+        $liste = array();
+        $i=0;
+        $liste[$i]['charset'] = 'UTF-8';
+        $liste[$i]['description'] = 'UTF-8';
+        return $liste;
+    }
+
+	/**
+	 *	Return full path of dump program
+	 *
+	 *	@return		string		Full path of dump program
+	 */
+	function getPathOfDump()
+    {
+        $fullpathofdump='/pathtomysqldump/mysqldump';
+
+        $resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
+        if ($resql)
+        {
+            $liste=$this->fetch_array($resql);
+            $basedir=$liste['Value'];
+            $fullpathofdump=$basedir.(preg_match('/\/$/',$basedir)?'':'/').'bin/mysqldump';
+        }
+        return $fullpathofdump;
+    }
+
+	/**
+	 *	Return full path of restore program
+	 *
+	 *	@return		string		Full path of restore program
+	 */
+    function getPathOfRestore()
+    {
+        $fullpathofimport='/pathtomysql/mysql';
+
+        $resql=$this->query('SHOW VARIABLES LIKE \'basedir\'');
+        if ($resql)
+        {
+            $liste=$this->fetch_array($resql);
+            $basedir=$liste['Value'];
+            $fullpathofimport=$basedir.(preg_match('/\/$/',$basedir)?'':'/').'bin/mysql';
+        }
+        return $fullpathofimport;
+    }
+
+	/**
+	 * Return value of server parameters
+	 *
+	 * @param	string	$filter		Filter list on a particular value
+	 * @return	array				Array of key-values (key=>value)
+	 */
+    function getServerParametersValues($filter='')
+    {
+        $result=array();
+		static $pragmas;
+		if (! isset($pragmas)) {
+			// Définition de la liste des pragmas utilisés qui ne retournent qu'une seule valeur
+			// indépendante de la base de données.
+			// cf. http://www.sqlite.org/pragma.html
+			$pragmas = array(
+				'application_id', 'auto_vacuum', 'automatic_index', 'busy_timeout', 'cache_size',
+				'cache_spill', 'case_sensitive_like', 'checkpoint_fullsync', 'collation_list',
+				'compile_options', 'data_version',	/*'database_list',*/
+				'defer_foreign_keys', 'encoding', 'foreign_key_check', 'freelist_count',
+				'full_column_names', 'fullsync', 'ingore_check_constraints', 'integrity_check',
+				'journal_mode', 'journal_size_limit', 'legacy_file_format', 'locking_mode',
+				'max_page_count', 'page_count', 'page_size', 'parser_trace',
+				'query_only', 'quick_check', 'read_uncommitted', 'recursive_triggers',
+				'reverse_unordered_selects', 'schema_version', 'user_version',
+				'secure_delete', 'short_column_names', 'shrink_memory', 'soft_heap_limit',
+				'synchronous', 'temp_store', /*'temp_store_directory',*/ 'threads',
+				'vdbe_addoptrace', 'vdbe_debug', 'vdbe_listing', 'vdbe_trace',
+				'wal_autocheckpoint',
+			);
+		}
+
+		// TODO prendre en compte le filtre
+		foreach($pragmas as $var) {
+			$sql = "PRAGMA $var";
+			$resql=$this->query($sql);
+			if ($resql)
+			{
+				$obj = $this->fetch_row($resql);
+				//dol_syslog(get_class($this)."::select_db getServerParametersValues $var=". print_r($obj, true), LOG_DEBUG);
+				$result[$var] = $obj[0];
+			}
+		}
+        return $result;
+    }
+
+	/**
+	 * Return value of server status
+	 *
+	 * @param	string	$filter		Filter list on a particular value
+	 * @return  array				Array of key-values (key=>value)
+	 */
+    function getServerStatusValues($filter='')
+    {
+        $result=array();
+		/*
+        $sql='SHOW STATUS';
+        if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
+        $resql=$this->query($sql);
+        if ($resql)
+        {
+            while ($obj=$this->fetch_object($resql)) $result[$obj->Variable_name]=$obj->Value;
+        }
+		 */
+
+        return $result;
+    }
+
+	/**
+	 * Permet le chargement d'une fonction personnalisee dans le moteur de base de donnees.
+	 * Note: le nom de la fonction personnalisee est prefixee par 'db_'. La fonction doit être
+	 * statique et publique. Le nombre de parametres est determine automatiquement.
+	 * @param string $name Le nom de la fonction a definir dans Sqlite
+	 */
+	private function addCustomFunction($name, $arg_count = -1) {
+		if ($this->db) {
+			$localname = __CLASS__ . '::' . 'db_' . $name;
+			$reflectClass = new ReflectionClass(__CLASS__);
+			$reflectFunction = $reflectClass->getMethod('db_' . $name);
+			if ($arg_count < 0) {
+				$arg_count = $reflectFunction->getNumberOfParameters();
+			}
+			if (!$this->db->createFunction($name, $localname , $arg_count)) {
+				$this->error = "unable to create custom function '$name'";
+			}
+		}
+	}
+
+	/**
+	 * Cette fonction est l'equivalent de la fonction MONTH de MySql.
+	 * @param string $date
+	 * @return integer
+	 */
+	public static function db_MONTH($date) {
+		return date('n', strtotime($date));
+	}
+
+	/**
+	 *  calcule du numéro de semaine
+	 *
+	 *  @param string date
+	 *  @param int mode
+	 */
+	public static function db_WEEK($date, $mode = 0) {
+		$arr = date_parse($date);
+		$calc_year = 0;
+		return self::calc_week($arr['year'], $arr['month'], $arr['day'], self::week_mode($mode), $calc_year);
+	}
+
+	public static function db_CURDATE() {
+		return date('Y-m-d');
+	}
+
+	public static function db_CURTIME() {
+		return date('H:i:s');
+	}
+
+	public static function db_WEEKDAY($date) {
+		$arr = date_parse($date);
+		return self::calc_weekday(self::calc_daynr($arr['year'], $arr['month'], $arr['day']), 0);
+
+	}
+
+	/**
+	 * Cette fonction est l'equivelent de la fonction date_format de MySQL.
+	 * @staticvar string $mysql_replacement	Les symboles formatage a remplacer
+	 * @param string $date la date dans un format ISO
+	 * @param string $format la chaine de formatage
+	 * @return string La date formatee.
+	 */
+	public static function db_date_format($date, $format) {
+		static $mysql_replacement;
+		if (! isset($mysql_replacement)) {
+			$mysql_replacement = array(
+				'%' => '%',
+				'a' => 'D',
+				'b' => 'M',
+				'c' => 'n',
+				'D' => 'jS',
+				'd' => 'd',
+				'e' => 'j',
+				'f' => 'u',
+				'H' => 'H',
+				'h' => 'h',
+				'I' => 'h',
+				'i' => 'i',
+				'k' => 'H',
+				'l' => 'g',
+				'M' => 'F',
+				'm' => 'm',
+				'p' => 'A',
+				'r' => 'h:i:s A',
+				'S' => 's',
+				's' => 's',
+				'T' => 'H:i:s',
+				'W' => 'l',
+				'w' => 'w',
+				'Y' => 'Y',
+				'y' => 'y',
+			);
+		}
+
+		$fmt = '';
+		$lg = strlen($format);
+		$state = 0;
+		$timestamp = strtotime($date);
+		$yday = date('z', $timestamp);
+		$month = (integer)date("n", $timestamp);
+		$year = (integer)date("Y", $timestamp);
+		$day = (integer)date("d", $timestamp);
+		for($idx = 0; $idx < $lg; ++$idx) {
+			$char = $format[$idx];
+			if ($state == 0) {
+				if ($char == '%') {
+					$state = 1;
+				} else {
+					$fmt .= $char;
+				}
+			}
+			elseif ($state == 1) {
+				if (array_key_exists($char, $mysql_replacement)) {
+					$fmt .= $mysql_replacement[$char];
+				} else {
+					$calc_year = 0;
+					switch ($char) {
+						case 'j':	// day of the year 001
+							$char = sprintf("%03d", $yday+1);
+							break;
+						case 'U': // mode 0: semaine 0 = premiere semaine complète qui commence un dimanche
+							$char = sprintf("%02d", self::calc_week($year, $month, $day, 4, $calc_year));
+							break;
+						case 'u': // mode 1: semaine 0 = première semaine de 4 jours. Début le dimanche
+							$char = sprintf("%02d", self::calc_week($year, $month, $day, 1, $calc_year));
+							break;
+						case 'V': // mode 2: semaine 1 = premiere semaine complète qui commence un dimanche
+							$char = sprintf("%02d", self::calc_week($year, $month, $day, 6, $calc_year));
+							break;
+						case 'v':  // mode 3: semaine 1 = premiere semaine de 4 jours. Début le lundi
+							$char = sprintf("%02d", self::calc_week($year, $month, $day, 3, $calc_year));
+							break;
+						case 'X':
+							self::calc_week($year, $month, $day, 6, $calc_year);
+							$char = sprintf("%04d", $calc_year);
+							break;
+						case 'x':
+							self::calc_week($year, $month, $day, 3, $calc_year);
+							$char = sprintf("%04d", $calc_year);
+							break;
+					}
+					$fmt .= $char;
+				}
+				$state = 0;
+			}
+		}
+		return date($fmt, strtotime($date));
+	}
+
+	/**
+	 * Equivalent de la fonction MySQL IF
+	 * @param boolean $test Le resultat du test
+	 * @param mixed $true_part Partie a retourner si vrai
+	 * @param mixed $false_part Partie a retourner si faux
+	 * @return mixed Partie selectionnee en fonction du test
+	 */
+	public static function db_IF($test, $true_part, $false_part) {
+		return ( $test ) ? $true_part : $false_part;
+	}
+
+	// Adapté de mytime.c des sources de mariadb
+	// fonction calc_daynr
+	private static function calc_daynr($year, $month, $day) {
+		$y = $year;
+		if ($y == 0 && $month == 0) return 0;
+		$num = (365* $y + 31 * ($month - 1) + $day);
+		if ($month <= 2) {
+			$y--; }
+		else {
+			$num -= floor(($month * 4 + 23) / 10);
+		}
+		$temp = floor(($y / 100 + 1) * 3 / 4);
+		return $num + floor($y / 4) - $temp;
+	}
+
+	private static function calc_weekday($daynr, $sunday_first_day_of_week) {
+	  $ret = floor(($daynr + 5 + ($sunday_first_day_of_week ? 1 : 0)) % 7);
+	  return $ret;
+	}
+
+	private static function calc_days_in_year($year)
+	{
+	  return (($year & 3) == 0 && ($year%100 || ($year%400 == 0 && $year)) ? 366 : 365);
+	}
+
+	private static function week_mode($mode) {
+		$week_format= ($mode & 7);
+		if (!($week_format & self::WEEK_MONDAY_FIRST)) {
+			$week_format^= self::WEEK_FIRST_WEEKDAY;
+		}
+		return $week_format;
+	}
+
+
+	private static function calc_week($year, $month, $day, $week_behaviour, &$calc_year) {
+		$daynr=self::calc_daynr($year,$month,$day);
+		$first_daynr=self::calc_daynr($year,1,1);
+		$monday_first= ($week_behaviour & self::WEEK_MONDAY_FIRST) ? 1 : 0;
+		$week_year= ($week_behaviour & self::WEEK_YEAR) ? 1 : 0;
+		$first_weekday= ($week_behaviour & self::WEEK_FIRST_WEEKDAY) ? 1 : 0;
+
+		$weekday=self::calc_weekday($first_daynr, !$monday_first);
+		$calc_year=$year;
+
+		if ($month == 1 && $day <= 7-$weekday)
+		{
+			if (!$week_year && (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)))
+				return 0;
+			$week_year= 1;
+			$calc_year--;
+			$first_daynr-= ($days=self::calc_days_in_year($calc_year));
+			$weekday= ($weekday + 53*7- $days) % 7;
+	  }
+
+	  if (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)) {
+		$days= $daynr - ($first_daynr+ (7-$weekday));
+	  }
+	  else {
+		$days= $daynr - ($first_daynr - $weekday);
+	  }
+
+	  if ($week_year && $days >= 52*7)
+	  {
+		$weekday= ($weekday + self::calc_days_in_year($calc_year)) % 7;
+		if ((!$first_weekday && $weekday < 4) || ($first_weekday && $weekday == 0))
+		{
+		  $calc_year++;
+		  return 1;
+		}
+	  }
+	  return floor($days/7+1);
+	}
+
+}
+
diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php
index d934f79f0af..612c3c64148 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/etape2.php
@@ -51,7 +51,7 @@ if ($dolibarr_main_db_type == "mysql")  $choix=1;
 if ($dolibarr_main_db_type == "mysqli") $choix=1;
 if ($dolibarr_main_db_type == "pgsql")  $choix=2;
 if ($dolibarr_main_db_type == "mssql")  $choix=3;
-if ($dolibarr_main_db_type == "sqlite")  $choix=4;
+if ($dolibarr_main_db_type == "sqlite3")  $choix=4;
 
 //if (empty($choix)) dol_print_error('','Database type '.$dolibarr_main_db_type.' not supported into etape2.php page');
 
@@ -413,7 +413,7 @@ if ($action == "set")
         if ($choix==1) $dir = "mysql/functions/";
         elseif ($choix==2) $dir = "pgsql/functions/";
         elseif ($choix==3) $dir = "mssql/functions/";
-		elseif ($choix==4) { $dir = "sqlite/functions/"; }
+		elseif ($choix==4) { $dir = "sqlite3/functions/"; }
 
         // Creation donnees
         $file = "functions.sql";
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 49b80eb1b6b..ec3e208374b 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -306,7 +306,7 @@ if (! empty($force_install_message))
                     $class='DoliDB'.ucfirst($type);
                     include_once $dir."/".$file;
 
-                    //if ($type == 'sqlite') continue;    // We hide sqlite because support can't be complete unti sqlit does not manage foreign key creation after table creation
+                    if ($type == 'sqlite') continue;    // We hide sqlite because support can't be complete unti sqlit does not manage foreign key creation after table creation
 
 		            // Version min of database
                     $versionbasemin=explode('.',$class::VERSIONMIN);
@@ -320,7 +320,7 @@ if (! empty($force_install_message))
 		            if ($type=='mysqli') { $testfunction='mysqli_connect'; $testclass=''; }
 		            if ($type=='pgsql')  { $testfunction='pg_connect'; $testclass=''; }
 		            if ($type=='mssql')  { $testfunction='mssql_connect'; $testclass=''; }
-		            if ($type=='sqlite') { $testfunction=''; $testclass='PDO'; }
+		            if ($type=='sqlite3') { $testfunction=''; $testclass='SQLite3'; }
 		            $option.='<option value="'.$type.'"'.($defaultype == $type?' selected="selected"':'');
 		            if ($testfunction && ! function_exists($testfunction)) $option.=' disabled="disabled"';
 		            if ($testclass && ! class_exists($testclass)) $option.=' disabled="disabled"';
@@ -330,6 +330,7 @@ if (! empty($force_install_message))
 		            // Experimental
 		            if ($type=='mssql')  $option.=' '.$langs->trans("Experimental");
 		            elseif ($type=='sqlite') $option.=' '.$langs->trans("Experimental");
+		            elseif ($type=='sqlite3') $option.=' '.$langs->trans("Experimental");
 		            // No available
 		            elseif (! function_exists($testfunction)) $option.=' - '.$langs->trans("FunctionNotAvailableInThisPHP");
 		            $option.='</option>';
@@ -479,7 +480,7 @@ if (! empty($force_install_message))
 jQuery(document).ready(function() {
 
 	jQuery("#db_type").change(function() {
-		if (jQuery("#db_type").val()=='sqlite') { jQuery(".hidesqlite").hide(); }
+		if (jQuery("#db_type").val()=='sqlite' || jQuery("#db_type").val()=='sqlite3') { jQuery(".hidesqlite").hide(); }
 		else  { jQuery(".hidesqlite").show(); }
 	});
 
diff --git a/htdocs/install/sqlite/functions/functions.sql b/htdocs/install/sqlite3/functions/functions.sql
similarity index 100%
rename from htdocs/install/sqlite/functions/functions.sql
rename to htdocs/install/sqlite3/functions/functions.sql
diff --git a/htdocs/install/sqlite/index.html b/htdocs/install/sqlite3/index.html
similarity index 100%
rename from htdocs/install/sqlite/index.html
rename to htdocs/install/sqlite3/index.html

From dd2594692e9d6cab9ce6c3c329e606abf1ad43fb Mon Sep 17 00:00:00 2001
From: Guillaume de Lestanville <guillaume@lestanville.eu>
Date: Thu, 5 Mar 2015 17:35:37 +0100
Subject: [PATCH 25/93] Updating compatibility with Sqlite3

- Replace USING syntax by IN SELECT syntax
- Fix error on database creation
- Removing test on username parameter when installing.
---
 htdocs/admin/system/database-tables.php       |   2 +-
 htdocs/core/db/sqlite3.class.php              | 974 +++++++++---------
 htdocs/core/modules/DolibarrModules.class.php | 587 +++++------
 htdocs/install/etape1.php                     |   7 +-
 index.php                                     |   2 -
 5 files changed, 794 insertions(+), 778 deletions(-)
 delete mode 100644 index.php

diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 5ac7292042e..e75cec3f513 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -180,7 +180,7 @@ else
 		print '<table class="noborder">';
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("TableName").'</td>';
-		print '<td>Rows</td>';
+		print '<td>'.$langs->trans("NbOfRecord").'</td>';
 		print "</tr>\n";
 
 		$sql = "SELECT name, type FROM sqlite_master where type='table' and name not like 'sqlite%' ORDER BY name";
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index f232acb199e..c52578fa579 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -37,18 +37,18 @@ class DoliDBSqlite3 extends DoliDB
     const LABEL='Sqlite3';
     //! Version min database
     const VERSIONMIN='3.0.0';
-	//! Resultset of last query
-	private $_results;
+    //! Resultset of last query
+    private $_results;
 
-	const WEEK_MONDAY_FIRST=1;
-	const WEEK_YEAR = 2;
-	const WEEK_FIRST_WEEKDAY=4;
+    const WEEK_MONDAY_FIRST=1;
+    const WEEK_YEAR = 2;
+    const WEEK_FIRST_WEEKDAY=4;
 
 
     /**
 	 *	Constructor.
 	 *	This create an opened connexion to a database server and eventually to a database
-	 *
+     *
 	 *	@param      string	$type		Type of database (mysql, pgsql...)
 	 *	@param	    string	$host		Address of database server
 	 *	@param	    string	$user		Nom de l'utilisateur autorise
@@ -101,14 +101,14 @@ class DoliDBSqlite3 extends DoliDB
             $this->database_selected = 1;
             $this->database_name = $name;
 
-			$this->addCustomFunction('IF');
-			$this->addCustomFunction('MONTH');
-			$this->addCustomFunction('CURTIME');
-			$this->addCustomFunction('CURDATE');
-			$this->addCustomFunction('WEEK', 1);
-			$this->addCustomFunction('WEEK', 2);
-			$this->addCustomFunction('WEEKDAY');
-			$this->addCustomFunction('date_format');
+            $this->addCustomFunction('IF');
+            $this->addCustomFunction('MONTH');
+            $this->addCustomFunction('CURTIME');
+            $this->addCustomFunction('CURDATE');
+            $this->addCustomFunction('WEEK', 1);
+            $this->addCustomFunction('WEEK', 2);
+            $this->addCustomFunction('WEEKDAY');
+            $this->addCustomFunction('date_format');
             //$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         }
         else
@@ -135,83 +135,83 @@ class DoliDBSqlite3 extends DoliDB
      */
     static function convertSQLFromMysql($line,$type='ddl')
     {
-		// Removed empty line if this is a comment line for SVN tagging
-		if (preg_match('/^--\s\$Id/i',$line)) {
-			return '';
-		}
-		// Return line if this is a comment
-		if (preg_match('/^#/i',$line) || preg_match('/^$/i',$line) || preg_match('/^--/i',$line))
-		{
-			return $line;
-		}
-		if ($line != "")
-		{
-		    if ($type == 'auto')
-		    {
+        // Removed empty line if this is a comment line for SVN tagging
+        if (preg_match('/^--\s\$Id/i',$line)) {
+            return '';
+        }
+        // Return line if this is a comment
+        if (preg_match('/^#/i',$line) || preg_match('/^$/i',$line) || preg_match('/^--/i',$line))
+        {
+            return $line;
+        }
+        if ($line != "")
+        {
+            if ($type == 'auto')
+            {
               if (preg_match('/ALTER TABLE/i',$line)) $type='dml';
               else if (preg_match('/CREATE TABLE/i',$line)) $type='dml';
               else if (preg_match('/DROP TABLE/i',$line)) $type='dml';
-		    }
+            }
 
-		    if ($type == 'dml')
-		    {
+            if ($type == 'dml')
+            {
                 $line=preg_replace('/\s/',' ',$line);   // Replace tabulation with space
 
-		        // we are inside create table statement so lets process datatypes
-    			if (preg_match('/(ISAM|innodb)/i',$line)) { // end of create table sequence
-    				$line=preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb);/i',');',$line);
-    				$line=preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb);/i',');',$line);
-    				$line=preg_replace('/,$/','',$line);
-    			}
+                // we are inside create table statement so lets process datatypes
+                if (preg_match('/(ISAM|innodb)/i',$line)) { // end of create table sequence
+                    $line=preg_replace('/\)[\s\t]*type[\s\t]*=[\s\t]*(MyISAM|innodb);/i',');',$line);
+                    $line=preg_replace('/\)[\s\t]*engine[\s\t]*=[\s\t]*(MyISAM|innodb);/i',');',$line);
+                    $line=preg_replace('/,$/','',$line);
+                }
 
-    			// Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
-    			if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i',$line,$reg)) {
-    				$newline=preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i','\\1 \\2 integer PRIMARY KEY AUTOINCREMENT',$line);
+                // Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
+                if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i',$line,$reg)) {
+                    $newline=preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i','\\1 \\2 integer PRIMARY KEY AUTOINCREMENT',$line);
                     //$line = "-- ".$line." replaced by --\n".$newline;
                     $line=$newline;
-    			}
+                }
 
-    			// tinyint type conversion
-    			$line=str_replace('tinyint','smallint',$line);
+                // tinyint type conversion
+                $line=str_replace('tinyint','smallint',$line);
 
-    			// nuke unsigned
-    			$line=preg_replace('/(int\w+|smallint)\s+unsigned/i','\\1',$line);
+                // nuke unsigned
+                $line=preg_replace('/(int\w+|smallint)\s+unsigned/i','\\1',$line);
 
-    			// blob -> text
-    			$line=preg_replace('/\w*blob/i','text',$line);
+                // blob -> text
+                $line=preg_replace('/\w*blob/i','text',$line);
 
-    			// tinytext/mediumtext -> text
-    			$line=preg_replace('/tinytext/i','text',$line);
-    			$line=preg_replace('/mediumtext/i','text',$line);
+                // tinytext/mediumtext -> text
+                $line=preg_replace('/tinytext/i','text',$line);
+                $line=preg_replace('/mediumtext/i','text',$line);
 
-    			// change not null datetime field to null valid ones
-    			// (to support remapping of "zero time" to null
-    			$line=preg_replace('/datetime not null/i','datetime',$line);
-    			$line=preg_replace('/datetime/i','timestamp',$line);
+                // change not null datetime field to null valid ones
+                // (to support remapping of "zero time" to null
+                $line=preg_replace('/datetime not null/i','datetime',$line);
+                $line=preg_replace('/datetime/i','timestamp',$line);
 
-    			// double -> numeric
-    			$line=preg_replace('/^double/i','numeric',$line);
-    			$line=preg_replace('/(\s*)double/i','\\1numeric',$line);
-    			// float -> numeric
-    			$line=preg_replace('/^float/i','numeric',$line);
-    			$line=preg_replace('/(\s*)float/i','\\1numeric',$line);
+                // double -> numeric
+                $line=preg_replace('/^double/i','numeric',$line);
+                $line=preg_replace('/(\s*)double/i','\\1numeric',$line);
+                // float -> numeric
+                $line=preg_replace('/^float/i','numeric',$line);
+                $line=preg_replace('/(\s*)float/i','\\1numeric',$line);
 
-    			// unique index(field1,field2)
-    			if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i',$line))
-    			{
-    				$line=preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i','UNIQUE\(\\1\)',$line);
-    			}
+                // unique index(field1,field2)
+                if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i',$line))
+                {
+                    $line=preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i','UNIQUE\(\\1\)',$line);
+                }
 
-    			// We remove end of requests "AFTER fieldxxx"
-    			$line=preg_replace('/AFTER [a-z0-9_]+/i','',$line);
+                // We remove end of requests "AFTER fieldxxx"
+                $line=preg_replace('/AFTER [a-z0-9_]+/i','',$line);
 
-    			// We remove start of requests "ALTER TABLE tablexxx" if this is a DROP INDEX
-    			$line=preg_replace('/ALTER TABLE [a-z0-9_]+ DROP INDEX/i','DROP INDEX',$line);
+                // We remove start of requests "ALTER TABLE tablexxx" if this is a DROP INDEX
+                $line=preg_replace('/ALTER TABLE [a-z0-9_]+ DROP INDEX/i','DROP INDEX',$line);
 
                 // Translate order to rename fields
                 if (preg_match('/ALTER TABLE ([a-z0-9_]+) CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i',$line,$reg))
                 {
-                	$line = "-- ".$line." replaced by --\n";
+                    $line = "-- ".$line." replaced by --\n";
                     $line.= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
                 }
 
@@ -230,12 +230,12 @@ class DoliDBSqlite3 extends DoliDB
                 }
 
                 // alter table add primary key (field1, field2 ...) -> We create a unique index instead as dynamic creation of primary key is not supported
-    			// ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity);
-    			if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i',$line,$reg))
-    			{
-    				$line = "-- ".$line." replaced by --\n";
-    				$line.= "CREATE UNIQUE INDEX ".$reg[2]." ON ".$reg[1]."(".$reg[3];
-    			}
+                // ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity);
+                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i',$line,$reg))
+                {
+                    $line = "-- ".$line." replaced by --\n";
+                    $line.= "CREATE UNIQUE INDEX ".$reg[2]." ON ".$reg[1]."(".$reg[3];
+                }
 
                 // Translate order to drop foreign keys
                 // ALTER TABLE llx_dolibarr_modules DROP FOREIGN KEY fk_xxx;
@@ -245,62 +245,62 @@ class DoliDBSqlite3 extends DoliDB
                     $line.= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
                 }
 
-    			// alter table add [unique] [index] (field1, field2 ...)
-    			// ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
-    			if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i',$line,$reg))
-    			{
-    				$fieldlist=$reg[4];
-    				$idxname=$reg[3];
-    				$tablename=$reg[1];
-    				$line = "-- ".$line." replaced by --\n";
-    				$line.= "CREATE ".(preg_match('/UNIQUE/',$reg[2])?'UNIQUE ':'')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
-    			}
-				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i',$line, $reg)) {
-					// Pour l'instant les contraintes ne sont pas créées
-					dol_syslog(get_class().'::query line emptied');
-					$line = 'SELECT 0;';
+                // alter table add [unique] [index] (field1, field2 ...)
+                // ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
+                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i',$line,$reg))
+                {
+                    $fieldlist=$reg[4];
+                    $idxname=$reg[3];
+                    $tablename=$reg[1];
+                    $line = "-- ".$line." replaced by --\n";
+                    $line.= "CREATE ".(preg_match('/UNIQUE/',$reg[2])?'UNIQUE ':'')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
+                }
+                if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i',$line, $reg)) {
+                    // Pour l'instant les contraintes ne sont pas créées
+                    dol_syslog(get_class().'::query line emptied');
+                    $line = 'SELECT 0;';
 
-				}
+                }
 
-				//if (preg_match('/rowid\s+.*\s+PRIMARY\s+KEY,/i', $line)) {
-					//preg_replace('/(rowid\s+.*\s+PRIMARY\s+KEY\s*,)/i', '/* \\1 */', $line);
-				//}
+                //if (preg_match('/rowid\s+.*\s+PRIMARY\s+KEY,/i', $line)) {
+                    //preg_replace('/(rowid\s+.*\s+PRIMARY\s+KEY\s*,)/i', '/* \\1 */', $line);
+                //}
             }
 
-			// Delete using criteria on other table must not declare twice the deleted table
-			// DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable
-			if (preg_match('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i',$line,$reg))
-			{
+            // Delete using criteria on other table must not declare twice the deleted table
+            // DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable
+            if (preg_match('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i',$line,$reg))
+            {
 				if ($reg[1] == $reg[2])	// If same table, we remove second one
-				{
-					$line=preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i','DELETE FROM \\1 USING \\3', $line);
-				}
-			}
+                {
+                    $line=preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i','DELETE FROM \\1 USING \\3', $line);
+                }
+            }
 
-			// Remove () in the tables in FROM if one table
-			$line=preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i','FROM \\1',$line);
-			//print $line."\n";
+            // Remove () in the tables in FROM if one table
+            $line=preg_replace('/FROM\s*\((([a-z_]+)\s+as\s+([a-z_]+)\s*)\)/i','FROM \\1',$line);
+            //print $line."\n";
 
-			// Remove () in the tables in FROM if two table
-			$line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2',$line);
-			//print $line."\n";
+            // Remove () in the tables in FROM if two table
+            $line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2',$line);
+            //print $line."\n";
 
-			// Remove () in the tables in FROM if two table
-			$line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2, \\3',$line);
-			//print $line."\n";
+            // Remove () in the tables in FROM if two table
+            $line=preg_replace('/FROM\s*\(([a-z_]+\s+as\s+[a-z_]+)\s*,\s*([a-z_]+\s+as\s+[a-z_]+\s*),\s*([a-z_]+\s+as\s+[a-z_]+\s*)\)/i','FROM \\1, \\2, \\3',$line);
+            //print $line."\n";
 
-			//print "type=".$type." newline=".$line."<br>\n";
-		}
+            //print "type=".$type." newline=".$line."<br>\n";
+        }
 
-		return $line;
+        return $line;
     }
 
-	/**
+    /**
 	 *	Select a database
-	 *
+     *
 	 *	@param	    string	$database	Name of database
 	 *	@return	    boolean  		    true if OK, false if KO
-	 */
+     */
     function select_db($database)
     {
         dol_syslog(get_class($this)."::select_db database=".$database, LOG_DEBUG);
@@ -310,7 +310,7 @@ class DoliDBSqlite3 extends DoliDB
 
     /**
 	 *	Connexion to server
-	 *
+     *
 	 *	@param	    string	$host		database server host
 	 *	@param	    string	$login		login
 	 *	@param	    string	$passwd		password
@@ -329,7 +329,7 @@ class DoliDBSqlite3 extends DoliDB
         if (empty($dir)) $dir=DOL_DATA_ROOT;
         // With sqlite, port must be in connect parameters
         //if (! $newport) $newport=3306;
-		$database_name = $dir.'/database_'.$name.'.sdb';
+        $database_name = $dir.'/database_'.$name.'.sdb';
         try {
             /*** connect to SQLite database ***/
             //$this->db = new PDO("sqlite:".$dir.'/database_'.$name.'.sdb');
@@ -349,12 +349,12 @@ class DoliDBSqlite3 extends DoliDB
 
     /**
 	 *	Return version of database server
-	 *
+     *
 	 *	@return	        string      Version string
      */
     function getVersion()
     {
-		return $this->db->version()['versionString'];
+        return $this->db->version()['versionString'];
     }
 
     /**
@@ -364,10 +364,10 @@ class DoliDBSqlite3 extends DoliDB
      */
     function getDriverInfo()
     {
-	    // FIXME: Dummy method
-	    // TODO: Implement
+        // FIXME: Dummy method
+        // TODO: Implement
 
-    	return '';
+        return '';
     }
 
 
@@ -381,9 +381,9 @@ class DoliDBSqlite3 extends DoliDB
     {
         if ($this->db)
         {
-	        if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
+            if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened,LOG_ERR);
             $this->connected=0;
-			$this->db->close();
+            $this->db->close();
             $this->db=null;    // Clean this->db
             return true;
         }
@@ -391,7 +391,7 @@ class DoliDBSqlite3 extends DoliDB
     }
 
     /**
-     * 	Execute a SQL request and return the resultset
+     *  Execute a SQL request and return the resultset
      *
      * 	@param	string	$query			SQL query string
      * 	@param	int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
@@ -407,58 +407,58 @@ class DoliDBSqlite3 extends DoliDB
         $query = trim($query);
         $this->error = 0;
 
-		// Convert MySQL syntax to SQLite syntax
-		if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i',$query, $reg)) {
-			// Ajout d'une clef étrangère à la table
-			// procédure de remplacement de la table pour ajouter la contrainte
-			// Exemple : ALTER TABLE llx_adherent ADD CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid)
-			// -> CREATE TABLE ( ... ,CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid))
-			$foreignFields = $reg[5];
-			$foreignTable = $reg[4];
-			$localfields = $reg[3];
-			$constraintname=trim($reg[2]);
-			$tablename=trim($reg[1]);
+        // Convert MySQL syntax to SQLite syntax
+        if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i',$query, $reg)) {
+            // Ajout d'une clef étrangère à la table
+            // procédure de remplacement de la table pour ajouter la contrainte
+            // Exemple : ALTER TABLE llx_adherent ADD CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid)
+            // -> CREATE TABLE ( ... ,CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid))
+            $foreignFields = $reg[5];
+            $foreignTable = $reg[4];
+            $localfields = $reg[3];
+            $constraintname=trim($reg[2]);
+            $tablename=trim($reg[1]);
 
-			$descTable = $this->db->querySingle("SELECT sql FROM sqlite_master WHERE name='" . $tablename . "'");
+            $descTable = $this->db->querySingle("SELECT sql FROM sqlite_master WHERE name='" . $tablename . "'");
 
-			// 1- Renommer la table avec un nom temporaire
-			$this->query('ALTER TABLE ' . $tablename . ' RENAME TO tmp_' . $tablename);
+            // 1- Renommer la table avec un nom temporaire
+            $this->query('ALTER TABLE ' . $tablename . ' RENAME TO tmp_' . $tablename);
 
-			// 2- Recréer la table avec la contrainte ajoutée
+            // 2- Recréer la table avec la contrainte ajoutée
 
-			// on bricole la requete pour ajouter la contrainte
-			$descTable = substr($descTable, 0, strlen($descTable) - 1);
-			$descTable .= ", CONSTRAINT " . $constraintname . " FOREIGN KEY (" . $localfields . ") REFERENCES " .$foreignTable . "(" . $foreignFields . ")";
+            // on bricole la requete pour ajouter la contrainte
+            $descTable = substr($descTable, 0, strlen($descTable) - 1);
+            $descTable .= ", CONSTRAINT " . $constraintname . " FOREIGN KEY (" . $localfields . ") REFERENCES " .$foreignTable . "(" . $foreignFields . ")";
 
-			// fermeture de l'instruction
-			$descTable .= ')';
+            // fermeture de l'instruction
+            $descTable .= ')';
 
-			// Création proprement dite de la table
-			$this->query($descTable);
+            // Création proprement dite de la table
+            $this->query($descTable);
 
-			// 3- Transférer les données
-			$this->query('INSERT INTO ' . $tablename . ' SELECT * FROM tmp_' . $tablename);
+            // 3- Transférer les données
+            $this->query('INSERT INTO ' . $tablename . ' SELECT * FROM tmp_' . $tablename);
 
-			// 4- Supprimer la table temporaire
-			$this->query('DROP TABLE tmp_' . $tablename);
+            // 4- Supprimer la table temporaire
+            $this->query('DROP TABLE tmp_' . $tablename);
 
-			// dummy statement
-			$query="SELECT 0";
+            // dummy statement
+            $query="SELECT 0";
 
-		} else {
-			$query=$this->convertSQLFromMysql($query,$type);
-		}
-		//print "After convertSQLFromMysql:\n".$query."<br>\n";
+        } else {
+            $query=$this->convertSQLFromMysql($query,$type);
+        }
+        //print "After convertSQLFromMysql:\n".$query."<br>\n";
 
-	    dol_syslog('sql='.$query, LOG_DEBUG);
+        dol_syslog('sql='.$query, LOG_DEBUG);
 
-	    // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
+        // Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
         try {
             //$ret = $this->db->exec($query);
-            $ret = $this->db->query($query);        // $ret is a PDO object
-			if ($ret) {
-				$ret->queryString = $query;
-			}
+            $ret = $this->db->query($query);        // $ret is a Sqlite3Result
+            if ($ret) {
+                $ret->queryString = $query;
+            }
         }
         catch(Exception $e)
         {
@@ -474,15 +474,15 @@ class DoliDBSqlite3 extends DoliDB
                 $this->lasterror = $this->error();
                 $this->lasterrno = $this->errno();
 
-	            dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
+                dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR);
 
-	            $errormsg = get_class($this)."::query SQL Error message: ".$this->lasterror;
+                $errormsg = get_class($this)."::query SQL Error message: ".$this->lasterror;
 
-				if (preg_match('/[0-9]/',$this->lasterrno)) {
+                if (preg_match('/[0-9]/',$this->lasterrno)) {
                     $errormsg .= ' ('.$this->lasterrno.')';
                 }
 
-	            dol_syslog($errormsg, LOG_ERR);
+                dol_syslog($errormsg, LOG_ERR);
             }
             $this->lastquery=$query;
             $this->_results = $ret;
@@ -502,10 +502,10 @@ class DoliDBSqlite3 extends DoliDB
         // Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
         //return $resultset->fetch(PDO::FETCH_OBJ);
-		$ret = $resultset->fetchArray(SQLITE3_ASSOC);
-		if ($ret) {
-			return (object)$ret;
-		}
+        $ret = $resultset->fetchArray(SQLITE3_ASSOC);
+        if ($ret) {
+            return (object)$ret;
+        }
     }
 
 
@@ -520,10 +520,10 @@ class DoliDBSqlite3 extends DoliDB
         // If resultset not provided, we take the last used by connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
         //return $resultset->fetch(PDO::FETCH_ASSOC);
-		$ret = $resultset->fetchArray(SQLITE3_ASSOC);
-		if ($ret) {
-			return (array)$ret;
-		}
+        $ret = $resultset->fetchArray(SQLITE3_ASSOC);
+        if ($ret) {
+            return (array)$ret;
+        }
     }
 
     /**
@@ -558,10 +558,10 @@ class DoliDBSqlite3 extends DoliDB
     {
         // If resultset not provided, we take the last used by connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
-		if (preg_match("/^SELECT/i", $resultset->queryString)) {
-			return $this->db->querySingle("SELECT count(*) FROM (" . $resultset->queryString . ") q");
-		}
-		return 0;
+        if (preg_match("/^SELECT/i", $resultset->queryString)) {
+            return $this->db->querySingle("SELECT count(*) FROM (" . $resultset->queryString . ") q");
+        }
+        return 0;
     }
 
     /**
@@ -575,21 +575,21 @@ class DoliDBSqlite3 extends DoliDB
     {
         // If resultset not provided, we take the last used by connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
-		if (preg_match("/^SELECT/i", $resultset->queryString)) {
-			return $this->num_rows($resultset);
-		}
+        if (preg_match("/^SELECT/i", $resultset->queryString)) {
+            return $this->num_rows($resultset);
+        }
         // mysql necessite un link de base pour cette fonction contrairement
         // a pqsql qui prend un resultset
         return $this->db->changes();
     }
 
 
-	/**
+    /**
 	 *	Free last resultset used.
-	 *
+     *
 	 *	@param  resultset	$resultset   Curseur de la requete voulue
 	 *	@return	void
-	 */
+     */
     function free($resultset=0)
     {
         // If resultset not provided, we take the last used by connexion
@@ -598,15 +598,15 @@ class DoliDBSqlite3 extends DoliDB
         if ($resultset && is_object($resultset)) $resultset->finalize();
     }
 
-	/**
+    /**
 	 *	Escape a string to insert data
-	 *
+     *
 	 *  @param	string	$stringtoencode		String to escape
 	 *  @return	string						String escaped
-	 */
+     */
     function escape($stringtoencode)
     {
-		return Sqlite3::escapeString($stringtoencode);
+        return Sqlite3::escapeString($stringtoencode);
     }
 
     /**
@@ -656,19 +656,19 @@ class DoliDBSqlite3 extends DoliDB
             }*/
             $errno=$this->db->lastErrorCode();
 			if ($errno=='HY000' || $errno == 0)
-			{
+            {
                 if (preg_match('/table.*already exists/i',$this->error))     return 'DB_ERROR_TABLE_ALREADY_EXISTS';
                 elseif (preg_match('/index.*already exists/i',$this->error)) return 'DB_ERROR_KEY_NAME_ALREADY_EXISTS';
                 elseif (preg_match('/syntax error/i',$this->error))          return 'DB_ERROR_SYNTAX';
-			}
-			if ($errno=='23000')
-			{
+            }
+            if ($errno=='23000')
+            {
                 if (preg_match('/column.* not unique/i',$this->error))       return 'DB_ERROR_RECORD_ALREADY_EXISTS';
                 elseif (preg_match('/PRIMARY KEY must be unique/i',$this->error)) return 'DB_ERROR_RECORD_ALREADY_EXISTS';
-			}
-			if ($errno > 1) {
-				// TODO Voir la liste des messages d'erreur
-			}
+            }
+            if ($errno > 1) {
+                // TODO Voir la liste des messages d'erreur
+            }
 
             return ($errno?'DB_ERROR_'.$errno:'0');
         }
@@ -691,8 +691,8 @@ class DoliDBSqlite3 extends DoliDB
     }
 
     /**
-	 * Get last ID after an insert INSERT
-	 *
+     * Get last ID after an insert INSERT
+     *
 	 * @param   string	$tab    	Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql
 	 * @param	string	$fieldid	Field name
 	 * @return  int     			Id of row
@@ -772,13 +772,13 @@ class DoliDBSqlite3 extends DoliDB
 
 
     /**
-	 * Return connexion ID
-	 *
+     * Return connexion ID
+     *
 	 * @return	        string      Id connexion
      */
     function DDLGetConnectId()
     {
-		return '?';
+        return '?';
     }
 
 
@@ -786,7 +786,7 @@ class DoliDBSqlite3 extends DoliDB
 	 *	Create a new database
 	 *	Do not use function xxx_create_db (xxx=mysql, ...) as they are deprecated
 	 *	We force to create database with charset this->forcecharset and collate this->forcecollate
-	 *
+     *
 	 *	@param	string	$database		Database name to create
 	 * 	@param	string	$charset		Charset used to store data
 	 * 	@param	string	$collation		Charset used to sort data
@@ -815,8 +815,8 @@ class DoliDBSqlite3 extends DoliDB
     }
 
     /**
-	 *  List tables into a database
-	 *
+     *  List tables into a database
+     *
 	 *  @param	string		$database	Name of database
 	 *  @param	string		$table		Name of table filter ('xxx%')
 	 *  @return	array					List of tables in an array
@@ -839,7 +839,7 @@ class DoliDBSqlite3 extends DoliDB
 
     /**
 	 *	List information of columns into a table.
-	 *
+     *
 	 *	@param	string	$table		Name of table
 	 *	@return	array				Tableau des informations des champs de la table
 	 *	TODO modify for sqlite
@@ -861,7 +861,7 @@ class DoliDBSqlite3 extends DoliDB
 
     /**
 	 *	Create a table into database
-	 *
+     *
 	 *	@param	    string	$table 			Nom de la table
 	 *	@param	    array	$fields 		Tableau associatif [nom champ][tableau des descriptions]
 	 *	@param	    string	$primary_key 	Nom du champ qui sera la clef primaire
@@ -938,7 +938,7 @@ class DoliDBSqlite3 extends DoliDB
 
     /**
 	 *	Return a pointer of line with description of a table or field
-	 *
+     *
 	 *	@param	string		$table	Name of table
 	 *	@param	string		$field	Optionnel : Name of field if we want description of field
 	 *	@return	resource			Resource
@@ -954,7 +954,7 @@ class DoliDBSqlite3 extends DoliDB
 
     /**
 	 *	Create a new field into table
-	 *
+     *
 	 *	@param	string	$table 				Name of table
 	 *	@param	string	$field_name 		Name of field to add
 	 *	@param	string	$field_desc 		Tableau associatif de description du champ a inserer[nom du parametre][valeur du parametre]
@@ -1000,7 +1000,7 @@ class DoliDBSqlite3 extends DoliDB
 
     /**
 	 *	Update format of a field into a table
-	 *
+     *
 	 *	@param	string	$table 				Name of table
 	 *	@param	string	$field_name 		Name of field to modify
 	 *	@param	string	$field_desc 		Array with description of field format
@@ -1011,7 +1011,7 @@ class DoliDBSqlite3 extends DoliDB
         $sql = "ALTER TABLE ".$table;
         $sql .= " MODIFY COLUMN ".$field_name." ".$field_desc['type'];
         if ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int' || $field_desc['type'] == 'varchar') {
-        	$sql.="(".$field_desc['value'].")";
+            $sql.="(".$field_desc['value'].")";
         }
 
         dol_syslog(get_class($this)."::DDLUpdateField ".$sql,LOG_DEBUG);
@@ -1023,7 +1023,7 @@ class DoliDBSqlite3 extends DoliDB
 
     /**
 	 *	Drop a field from table
-	 *
+     *
 	 *	@param	string	$table 			Name of table
 	 *	@param	string	$field_name 	Name of field to drop
 	 *	@return	int						<0 if KO, >0 if OK
@@ -1043,7 +1043,7 @@ class DoliDBSqlite3 extends DoliDB
 
     /**
 	 * 	Create a user and privileges to connect to database (even if database does not exists yet)
-	 *
+     *
 	 *	@param	string	$dolibarr_main_db_host 		Ip serveur
 	 *	@param	string	$dolibarr_main_db_user 		Nom user a creer
 	 *	@param	string	$dolibarr_main_db_pass 		Mot de passe user a creer
@@ -1088,21 +1088,21 @@ class DoliDBSqlite3 extends DoliDB
         return 1;
     }
 
-	/**
+    /**
 	 *	Return charset used to store data in database
-	 *
+     *
 	 *	@return		string		Charset
-	 */
+     */
     function getDefaultCharacterSetDatabase()
     {
         return 'UTF-8';
     }
 
-	/**
+    /**
 	 *	Return list of available charset that can be used to store data in database
-	 *
+     *
 	 *	@return		array		List of Charset
-	 */
+     */
     function getListOfCharacterSet()
     {
         $liste = array();
@@ -1112,21 +1112,21 @@ class DoliDBSqlite3 extends DoliDB
         return $liste;
     }
 
-	/**
+    /**
 	 *	Return collation used in database
-	 *
+     *
 	 *	@return		string		Collation value
-	 */
+     */
     function getDefaultCollationDatabase()
     {
         return 'UTF-8';
     }
 
-	/**
+    /**
 	 *	Return list of available collation that can be used for database
-	 *
+     *
 	 *	@return		array		List of Collation
-	 */
+     */
     function getListOfCollation()
     {
         $liste = array();
@@ -1136,12 +1136,12 @@ class DoliDBSqlite3 extends DoliDB
         return $liste;
     }
 
-	/**
+    /**
 	 *	Return full path of dump program
-	 *
+     *
 	 *	@return		string		Full path of dump program
-	 */
-	function getPathOfDump()
+     */
+    function getPathOfDump()
     {
         $fullpathofdump='/pathtomysqldump/mysqldump';
 
@@ -1155,11 +1155,11 @@ class DoliDBSqlite3 extends DoliDB
         return $fullpathofdump;
     }
 
-	/**
+    /**
 	 *	Return full path of restore program
-	 *
+     *
 	 *	@return		string		Full path of restore program
-	 */
+     */
     function getPathOfRestore()
     {
         $fullpathofimport='/pathtomysql/mysql';
@@ -1174,61 +1174,65 @@ class DoliDBSqlite3 extends DoliDB
         return $fullpathofimport;
     }
 
-	/**
-	 * Return value of server parameters
-	 *
+    /**
+     * Return value of server parameters
+     *
 	 * @param	string	$filter		Filter list on a particular value
 	 * @return	array				Array of key-values (key=>value)
-	 */
+     */
     function getServerParametersValues($filter='')
     {
         $result=array();
-		static $pragmas;
-		if (! isset($pragmas)) {
-			// Définition de la liste des pragmas utilisés qui ne retournent qu'une seule valeur
-			// indépendante de la base de données.
-			// cf. http://www.sqlite.org/pragma.html
-			$pragmas = array(
-				'application_id', 'auto_vacuum', 'automatic_index', 'busy_timeout', 'cache_size',
-				'cache_spill', 'case_sensitive_like', 'checkpoint_fullsync', 'collation_list',
+        static $pragmas;
+        if (! isset($pragmas)) {
+            // Définition de la liste des pragmas utilisés qui ne retournent qu'une seule valeur
+            // indépendante de la base de données.
+            // cf. http://www.sqlite.org/pragma.html
+            $pragmas = array(
+                'application_id', 'auto_vacuum', 'automatic_index', 'busy_timeout', 'cache_size',
+                'cache_spill', 'case_sensitive_like', 'checkpoint_fullsync', 'collation_list',
 				'compile_options', 'data_version',	/*'database_list',*/
-				'defer_foreign_keys', 'encoding', 'foreign_key_check', 'freelist_count',
-				'full_column_names', 'fullsync', 'ingore_check_constraints', 'integrity_check',
-				'journal_mode', 'journal_size_limit', 'legacy_file_format', 'locking_mode',
-				'max_page_count', 'page_count', 'page_size', 'parser_trace',
-				'query_only', 'quick_check', 'read_uncommitted', 'recursive_triggers',
-				'reverse_unordered_selects', 'schema_version', 'user_version',
-				'secure_delete', 'short_column_names', 'shrink_memory', 'soft_heap_limit',
-				'synchronous', 'temp_store', /*'temp_store_directory',*/ 'threads',
-				'vdbe_addoptrace', 'vdbe_debug', 'vdbe_listing', 'vdbe_trace',
-				'wal_autocheckpoint',
-			);
-		}
+                'defer_foreign_keys', 'encoding', 'foreign_key_check', 'freelist_count',
+                'full_column_names', 'fullsync', 'ingore_check_constraints', 'integrity_check',
+                'journal_mode', 'journal_size_limit', 'legacy_file_format', 'locking_mode',
+                'max_page_count', 'page_count', 'page_size', 'parser_trace',
+                'query_only', 'quick_check', 'read_uncommitted', 'recursive_triggers',
+                'reverse_unordered_selects', 'schema_version', 'user_version',
+                'secure_delete', 'short_column_names', 'shrink_memory', 'soft_heap_limit',
+                'synchronous', 'temp_store', /*'temp_store_directory',*/ 'threads',
+                'vdbe_addoptrace', 'vdbe_debug', 'vdbe_listing', 'vdbe_trace',
+                'wal_autocheckpoint',
+            );
+        }
 
-		// TODO prendre en compte le filtre
-		foreach($pragmas as $var) {
-			$sql = "PRAGMA $var";
-			$resql=$this->query($sql);
-			if ($resql)
-			{
-				$obj = $this->fetch_row($resql);
-				//dol_syslog(get_class($this)."::select_db getServerParametersValues $var=". print_r($obj, true), LOG_DEBUG);
-				$result[$var] = $obj[0];
-			}
-		}
+        // TODO prendre en compte le filtre
+        foreach($pragmas as $var) {
+            $sql = "PRAGMA $var";
+            $resql=$this->query($sql);
+            if ($resql)
+            {
+                $obj = $this->fetch_row($resql);
+                //dol_syslog(get_class($this)."::select_db getServerParametersValues $var=". print_r($obj, true), LOG_DEBUG);
+                $result[$var] = $obj[0];
+            }
+            else {
+                // TODO Récupérer le message
+                $result[$var] = 'FAIL';
+            }
+        }
         return $result;
     }
 
-	/**
-	 * Return value of server status
-	 *
+    /**
+     * Return value of server status
+     *
 	 * @param	string	$filter		Filter list on a particular value
 	 * @return  array				Array of key-values (key=>value)
-	 */
+     */
     function getServerStatusValues($filter='')
     {
         $result=array();
-		/*
+        /*
         $sql='SHOW STATUS';
         if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
         $resql=$this->query($sql);
@@ -1236,243 +1240,243 @@ class DoliDBSqlite3 extends DoliDB
         {
             while ($obj=$this->fetch_object($resql)) $result[$obj->Variable_name]=$obj->Value;
         }
-		 */
+         */
 
         return $result;
     }
 
-	/**
-	 * Permet le chargement d'une fonction personnalisee dans le moteur de base de donnees.
-	 * Note: le nom de la fonction personnalisee est prefixee par 'db_'. La fonction doit être
-	 * statique et publique. Le nombre de parametres est determine automatiquement.
-	 * @param string $name Le nom de la fonction a definir dans Sqlite
-	 */
-	private function addCustomFunction($name, $arg_count = -1) {
-		if ($this->db) {
-			$localname = __CLASS__ . '::' . 'db_' . $name;
-			$reflectClass = new ReflectionClass(__CLASS__);
-			$reflectFunction = $reflectClass->getMethod('db_' . $name);
-			if ($arg_count < 0) {
-				$arg_count = $reflectFunction->getNumberOfParameters();
-			}
-			if (!$this->db->createFunction($name, $localname , $arg_count)) {
-				$this->error = "unable to create custom function '$name'";
-			}
-		}
-	}
+    /**
+     * Permet le chargement d'une fonction personnalisee dans le moteur de base de donnees.
+     * Note: le nom de la fonction personnalisee est prefixee par 'db_'. La fonction doit être
+     * statique et publique. Le nombre de parametres est determine automatiquement.
+     * @param string $name Le nom de la fonction a definir dans Sqlite
+     */
+    private function addCustomFunction($name, $arg_count = -1) {
+        if ($this->db) {
+            $localname = __CLASS__ . '::' . 'db_' . $name;
+            $reflectClass = new ReflectionClass(__CLASS__);
+            $reflectFunction = $reflectClass->getMethod('db_' . $name);
+            if ($arg_count < 0) {
+                $arg_count = $reflectFunction->getNumberOfParameters();
+            }
+            if (!$this->db->createFunction($name, $localname , $arg_count)) {
+                $this->error = "unable to create custom function '$name'";
+            }
+        }
+    }
 
-	/**
-	 * Cette fonction est l'equivalent de la fonction MONTH de MySql.
-	 * @param string $date
-	 * @return integer
-	 */
-	public static function db_MONTH($date) {
-		return date('n', strtotime($date));
-	}
+    /**
+     * Cette fonction est l'equivalent de la fonction MONTH de MySql.
+     * @param string $date
+     * @return integer
+     */
+    public static function db_MONTH($date) {
+        return date('n', strtotime($date));
+    }
 
-	/**
-	 *  calcule du numéro de semaine
-	 *
-	 *  @param string date
-	 *  @param int mode
-	 */
-	public static function db_WEEK($date, $mode = 0) {
-		$arr = date_parse($date);
-		$calc_year = 0;
-		return self::calc_week($arr['year'], $arr['month'], $arr['day'], self::week_mode($mode), $calc_year);
-	}
+    /**
+     *  calcule du numéro de semaine
+     *
+     *  @param string date
+     *  @param int mode
+     */
+    public static function db_WEEK($date, $mode = 0) {
+        $arr = date_parse($date);
+        $calc_year = 0;
+        return self::calc_week($arr['year'], $arr['month'], $arr['day'], self::week_mode($mode), $calc_year);
+    }
 
-	public static function db_CURDATE() {
-		return date('Y-m-d');
-	}
+    public static function db_CURDATE() {
+        return date('Y-m-d');
+    }
 
-	public static function db_CURTIME() {
-		return date('H:i:s');
-	}
+    public static function db_CURTIME() {
+        return date('H:i:s');
+    }
 
-	public static function db_WEEKDAY($date) {
-		$arr = date_parse($date);
-		return self::calc_weekday(self::calc_daynr($arr['year'], $arr['month'], $arr['day']), 0);
+    public static function db_WEEKDAY($date) {
+        $arr = date_parse($date);
+        return self::calc_weekday(self::calc_daynr($arr['year'], $arr['month'], $arr['day']), 0);
 
-	}
+    }
 
-	/**
-	 * Cette fonction est l'equivelent de la fonction date_format de MySQL.
+    /**
+     * Cette fonction est l'equivelent de la fonction date_format de MySQL.
 	 * @staticvar string $mysql_replacement	Les symboles formatage a remplacer
-	 * @param string $date la date dans un format ISO
-	 * @param string $format la chaine de formatage
-	 * @return string La date formatee.
-	 */
-	public static function db_date_format($date, $format) {
-		static $mysql_replacement;
-		if (! isset($mysql_replacement)) {
-			$mysql_replacement = array(
-				'%' => '%',
-				'a' => 'D',
-				'b' => 'M',
-				'c' => 'n',
-				'D' => 'jS',
-				'd' => 'd',
-				'e' => 'j',
-				'f' => 'u',
-				'H' => 'H',
-				'h' => 'h',
-				'I' => 'h',
-				'i' => 'i',
-				'k' => 'H',
-				'l' => 'g',
-				'M' => 'F',
-				'm' => 'm',
-				'p' => 'A',
-				'r' => 'h:i:s A',
-				'S' => 's',
-				's' => 's',
-				'T' => 'H:i:s',
-				'W' => 'l',
-				'w' => 'w',
-				'Y' => 'Y',
-				'y' => 'y',
-			);
-		}
+     * @param string $date la date dans un format ISO
+     * @param string $format la chaine de formatage
+     * @return string La date formatee.
+     */
+    public static function db_date_format($date, $format) {
+        static $mysql_replacement;
+        if (! isset($mysql_replacement)) {
+            $mysql_replacement = array(
+                '%' => '%',
+                'a' => 'D',
+                'b' => 'M',
+                'c' => 'n',
+                'D' => 'jS',
+                'd' => 'd',
+                'e' => 'j',
+                'f' => 'u',
+                'H' => 'H',
+                'h' => 'h',
+                'I' => 'h',
+                'i' => 'i',
+                'k' => 'H',
+                'l' => 'g',
+                'M' => 'F',
+                'm' => 'm',
+                'p' => 'A',
+                'r' => 'h:i:s A',
+                'S' => 's',
+                's' => 's',
+                'T' => 'H:i:s',
+                'W' => 'l',
+                'w' => 'w',
+                'Y' => 'Y',
+                'y' => 'y',
+            );
+        }
 
-		$fmt = '';
-		$lg = strlen($format);
-		$state = 0;
-		$timestamp = strtotime($date);
-		$yday = date('z', $timestamp);
-		$month = (integer)date("n", $timestamp);
-		$year = (integer)date("Y", $timestamp);
-		$day = (integer)date("d", $timestamp);
-		for($idx = 0; $idx < $lg; ++$idx) {
-			$char = $format[$idx];
-			if ($state == 0) {
-				if ($char == '%') {
-					$state = 1;
-				} else {
-					$fmt .= $char;
-				}
-			}
-			elseif ($state == 1) {
-				if (array_key_exists($char, $mysql_replacement)) {
-					$fmt .= $mysql_replacement[$char];
-				} else {
-					$calc_year = 0;
-					switch ($char) {
+        $fmt = '';
+        $lg = strlen($format);
+        $state = 0;
+        $timestamp = strtotime($date);
+        $yday = date('z', $timestamp);
+        $month = (integer)date("n", $timestamp);
+        $year = (integer)date("Y", $timestamp);
+        $day = (integer)date("d", $timestamp);
+        for($idx = 0; $idx < $lg; ++$idx) {
+            $char = $format[$idx];
+            if ($state == 0) {
+                if ($char == '%') {
+                    $state = 1;
+                } else {
+                    $fmt .= $char;
+                }
+            }
+            elseif ($state == 1) {
+                if (array_key_exists($char, $mysql_replacement)) {
+                    $fmt .= $mysql_replacement[$char];
+                } else {
+                    $calc_year = 0;
+                    switch ($char) {
 						case 'j':	// day of the year 001
-							$char = sprintf("%03d", $yday+1);
-							break;
-						case 'U': // mode 0: semaine 0 = premiere semaine complète qui commence un dimanche
-							$char = sprintf("%02d", self::calc_week($year, $month, $day, 4, $calc_year));
-							break;
-						case 'u': // mode 1: semaine 0 = première semaine de 4 jours. Début le dimanche
-							$char = sprintf("%02d", self::calc_week($year, $month, $day, 1, $calc_year));
-							break;
-						case 'V': // mode 2: semaine 1 = premiere semaine complète qui commence un dimanche
-							$char = sprintf("%02d", self::calc_week($year, $month, $day, 6, $calc_year));
-							break;
-						case 'v':  // mode 3: semaine 1 = premiere semaine de 4 jours. Début le lundi
-							$char = sprintf("%02d", self::calc_week($year, $month, $day, 3, $calc_year));
-							break;
-						case 'X':
-							self::calc_week($year, $month, $day, 6, $calc_year);
-							$char = sprintf("%04d", $calc_year);
-							break;
-						case 'x':
-							self::calc_week($year, $month, $day, 3, $calc_year);
-							$char = sprintf("%04d", $calc_year);
-							break;
-					}
-					$fmt .= $char;
-				}
-				$state = 0;
-			}
-		}
-		return date($fmt, strtotime($date));
-	}
+                            $char = sprintf("%03d", $yday+1);
+                            break;
+                        case 'U': // mode 0: semaine 0 = premiere semaine complète qui commence un dimanche
+                            $char = sprintf("%02d", self::calc_week($year, $month, $day, 4, $calc_year));
+                            break;
+                        case 'u': // mode 1: semaine 0 = première semaine de 4 jours. Début le dimanche
+                            $char = sprintf("%02d", self::calc_week($year, $month, $day, 1, $calc_year));
+                            break;
+                        case 'V': // mode 2: semaine 1 = premiere semaine complète qui commence un dimanche
+                            $char = sprintf("%02d", self::calc_week($year, $month, $day, 6, $calc_year));
+                            break;
+                        case 'v':  // mode 3: semaine 1 = premiere semaine de 4 jours. Début le lundi
+                            $char = sprintf("%02d", self::calc_week($year, $month, $day, 3, $calc_year));
+                            break;
+                        case 'X':
+                            self::calc_week($year, $month, $day, 6, $calc_year);
+                            $char = sprintf("%04d", $calc_year);
+                            break;
+                        case 'x':
+                            self::calc_week($year, $month, $day, 3, $calc_year);
+                            $char = sprintf("%04d", $calc_year);
+                            break;
+                    }
+                    $fmt .= $char;
+                }
+                $state = 0;
+            }
+        }
+        return date($fmt, strtotime($date));
+    }
 
-	/**
-	 * Equivalent de la fonction MySQL IF
-	 * @param boolean $test Le resultat du test
-	 * @param mixed $true_part Partie a retourner si vrai
-	 * @param mixed $false_part Partie a retourner si faux
-	 * @return mixed Partie selectionnee en fonction du test
-	 */
-	public static function db_IF($test, $true_part, $false_part) {
-		return ( $test ) ? $true_part : $false_part;
-	}
+    /**
+     * Equivalent de la fonction MySQL IF
+     * @param boolean $test Le resultat du test
+     * @param mixed $true_part Partie a retourner si vrai
+     * @param mixed $false_part Partie a retourner si faux
+     * @return mixed Partie selectionnee en fonction du test
+     */
+    public static function db_IF($test, $true_part, $false_part) {
+        return ( $test ) ? $true_part : $false_part;
+    }
 
-	// Adapté de mytime.c des sources de mariadb
-	// fonction calc_daynr
-	private static function calc_daynr($year, $month, $day) {
-		$y = $year;
-		if ($y == 0 && $month == 0) return 0;
-		$num = (365* $y + 31 * ($month - 1) + $day);
-		if ($month <= 2) {
-			$y--; }
-		else {
-			$num -= floor(($month * 4 + 23) / 10);
-		}
-		$temp = floor(($y / 100 + 1) * 3 / 4);
-		return $num + floor($y / 4) - $temp;
-	}
+    // Adapté de mytime.c des sources de mariadb
+    // fonction calc_daynr
+    private static function calc_daynr($year, $month, $day) {
+        $y = $year;
+        if ($y == 0 && $month == 0) return 0;
+        $num = (365* $y + 31 * ($month - 1) + $day);
+        if ($month <= 2) {
+            $y--; }
+        else {
+            $num -= floor(($month * 4 + 23) / 10);
+        }
+        $temp = floor(($y / 100 + 1) * 3 / 4);
+        return $num + floor($y / 4) - $temp;
+    }
 
-	private static function calc_weekday($daynr, $sunday_first_day_of_week) {
-	  $ret = floor(($daynr + 5 + ($sunday_first_day_of_week ? 1 : 0)) % 7);
-	  return $ret;
-	}
+    private static function calc_weekday($daynr, $sunday_first_day_of_week) {
+      $ret = floor(($daynr + 5 + ($sunday_first_day_of_week ? 1 : 0)) % 7);
+      return $ret;
+    }
 
-	private static function calc_days_in_year($year)
-	{
-	  return (($year & 3) == 0 && ($year%100 || ($year%400 == 0 && $year)) ? 366 : 365);
-	}
+    private static function calc_days_in_year($year)
+    {
+      return (($year & 3) == 0 && ($year%100 || ($year%400 == 0 && $year)) ? 366 : 365);
+    }
 
-	private static function week_mode($mode) {
-		$week_format= ($mode & 7);
-		if (!($week_format & self::WEEK_MONDAY_FIRST)) {
-			$week_format^= self::WEEK_FIRST_WEEKDAY;
-		}
-		return $week_format;
-	}
+    private static function week_mode($mode) {
+        $week_format= ($mode & 7);
+        if (!($week_format & self::WEEK_MONDAY_FIRST)) {
+            $week_format^= self::WEEK_FIRST_WEEKDAY;
+        }
+        return $week_format;
+    }
 
 
-	private static function calc_week($year, $month, $day, $week_behaviour, &$calc_year) {
-		$daynr=self::calc_daynr($year,$month,$day);
-		$first_daynr=self::calc_daynr($year,1,1);
-		$monday_first= ($week_behaviour & self::WEEK_MONDAY_FIRST) ? 1 : 0;
-		$week_year= ($week_behaviour & self::WEEK_YEAR) ? 1 : 0;
-		$first_weekday= ($week_behaviour & self::WEEK_FIRST_WEEKDAY) ? 1 : 0;
+    private static function calc_week($year, $month, $day, $week_behaviour, &$calc_year) {
+        $daynr=self::calc_daynr($year,$month,$day);
+        $first_daynr=self::calc_daynr($year,1,1);
+        $monday_first= ($week_behaviour & self::WEEK_MONDAY_FIRST) ? 1 : 0;
+        $week_year= ($week_behaviour & self::WEEK_YEAR) ? 1 : 0;
+        $first_weekday= ($week_behaviour & self::WEEK_FIRST_WEEKDAY) ? 1 : 0;
 
-		$weekday=self::calc_weekday($first_daynr, !$monday_first);
-		$calc_year=$year;
+        $weekday=self::calc_weekday($first_daynr, !$monday_first);
+        $calc_year=$year;
 
-		if ($month == 1 && $day <= 7-$weekday)
-		{
-			if (!$week_year && (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)))
-				return 0;
-			$week_year= 1;
-			$calc_year--;
-			$first_daynr-= ($days=self::calc_days_in_year($calc_year));
-			$weekday= ($weekday + 53*7- $days) % 7;
-	  }
+        if ($month == 1 && $day <= 7-$weekday)
+        {
+            if (!$week_year && (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)))
+                return 0;
+            $week_year= 1;
+            $calc_year--;
+            $first_daynr-= ($days=self::calc_days_in_year($calc_year));
+            $weekday= ($weekday + 53*7- $days) % 7;
+      }
 
-	  if (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)) {
-		$days= $daynr - ($first_daynr+ (7-$weekday));
-	  }
-	  else {
-		$days= $daynr - ($first_daynr - $weekday);
-	  }
+      if (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)) {
+        $days= $daynr - ($first_daynr+ (7-$weekday));
+      }
+      else {
+        $days= $daynr - ($first_daynr - $weekday);
+      }
 
-	  if ($week_year && $days >= 52*7)
-	  {
-		$weekday= ($weekday + self::calc_days_in_year($calc_year)) % 7;
-		if ((!$first_weekday && $weekday < 4) || ($first_weekday && $weekday == 0))
-		{
-		  $calc_year++;
-		  return 1;
-		}
-	  }
-	  return floor($days/7+1);
-	}
+      if ($week_year && $days >= 52*7)
+      {
+        $weekday= ($weekday + self::calc_days_in_year($calc_year)) % 7;
+        if ((!$first_weekday && $weekday < 4) || ($first_weekday && $weekday == 0))
+        {
+          $calc_year++;
+          return 1;
+        }
+      }
+      return floor($days/7+1);
+    }
 
 }
 
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 0b0ceb5460c..017d1eb8662 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -39,166 +39,166 @@ abstract class DolibarrModules
      */
     public $db;
 
-	/**
-	 * @var string Relative path to module style sheet
-	 * @deprecated
-	 */
-	public $style_sheet = '';
+    /**
+     * @var string Relative path to module style sheet
+     * @deprecated
+     */
+    public $style_sheet = '';
 
-	/**
-	 * @var array Paths to create when module is activated
-	 */
-	public $dirs = array();
+    /**
+     * @var array Paths to create when module is activated
+     */
+    public $dirs = array();
 
-	/**
-	 * @var array Module boxes
-	 */
-	public $boxes = array();
+    /**
+     * @var array Module boxes
+     */
+    public $boxes = array();
 
-	/**
-	 * @var array Module constants
-	 */
-	public $const = array();
+    /**
+     * @var array Module constants
+     */
+    public $const = array();
 
-	/**
-	 * @var array Module access rights
-	 */
-	public $rights;
+    /**
+     * @var array Module access rights
+     */
+    public $rights;
 
-	/**
-	 * @var string Module access rights family
-	 */
-	public $rights_class;
+    /**
+     * @var string Module access rights family
+     */
+    public $rights_class;
 
-	/**
-	 * @var array Module menu entries
-	 */
-	public $menu = array();
+    /**
+     * @var array Module menu entries
+     */
+    public $menu = array();
 
-	/**
-	 * @var array Module parts
-	 *  array(
-	 *      // Set this to 1 if module has its own trigger directory (/mymodule/core/triggers)
-	 *      'triggers' => 0,
-	 *      // Set this to 1 if module has its own login method directory (/mymodule/core/login)
+    /**
+     * @var array Module parts
+     *  array(
+     *      // Set this to 1 if module has its own trigger directory (/mymodule/core/triggers)
+     *      'triggers' => 0,
+     *      // Set this to 1 if module has its own login method directory (/mymodule/core/login)
 	 *  	'login' => 0,
-	 *      // Set this to 1 if module has its own substitution function file (/mymodule/core/substitutions)
+     *      // Set this to 1 if module has its own substitution function file (/mymodule/core/substitutions)
 	 *	    'substitutions' => 0,
-	 *      // Set this to 1 if module has its own menus handler directory (/mymodule/core/menus)
+     *      // Set this to 1 if module has its own menus handler directory (/mymodule/core/menus)
 	 *	    'menus' => 0,
-	 *      // Set this to 1 if module has its own theme directory (/mymodule/theme)
+     *      // Set this to 1 if module has its own theme directory (/mymodule/theme)
 	 *	    'theme' => 0,
-	 *      // Set this to 1 if module overwrite template dir (/mymodule/core/tpl)
-	 *      'tpl' => 0,
-	 *      // Set this to 1 if module has its own barcode directory (/mymodule/core/modules/barcode)
+     *      // Set this to 1 if module overwrite template dir (/mymodule/core/tpl)
+     *      'tpl' => 0,
+     *      // Set this to 1 if module has its own barcode directory (/mymodule/core/modules/barcode)
 	 *	    'barcode' => 0,
-	 *      // Set this to 1 if module has its own models directory (/mymodule/core/modules/xxx)
+     *      // Set this to 1 if module has its own models directory (/mymodule/core/modules/xxx)
 	 *	    'models' => 0,
-	 *      // Set this to relative path of css file if module has its own css file
+     *      // Set this to relative path of css file if module has its own css file
 	 *	    'css' => '/mymodule/css/mymodule.css.php',
-	 *      // Set this to relative path of js file if module must load a js on all pages
+     *      // Set this to relative path of js file if module must load a js on all pages
 	 *	    'js' => '/mymodule/js/mymodule.js',
-	 *      // Set here all hooks context managed by module
+     *      // Set here all hooks context managed by module
 	 *	    'hooks' => array('hookcontext1','hookcontext2'),
-	 *      // Set here all workflow context managed by module
+     *      // Set here all workflow context managed by module
 	 *	    'workflow' => array(
-	 *          'WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2' = >array(
-	 *              'enabled' => '! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)',
-	 *              'picto'=>'yourpicto@mymodule'
-	 *          )
-	 *      )
-	 *  )
-	 */
-	public $module_parts = array();
+     *          'WORKFLOW_MODULE1_YOURACTIONTYPE_MODULE2' = >array(
+     *              'enabled' => '! empty($conf->module1->enabled) && ! empty($conf->module2->enabled)',
+     *              'picto'=>'yourpicto@mymodule'
+     *          )
+     *      )
+     *  )
+     */
+    public $module_parts = array();
 
-	/**
-	 * @var string Module documents ?
-	 * @deprecated Seems unused anywhere
-	 */
-	public $docs;
+    /**
+     * @var string Module documents ?
+     * @deprecated Seems unused anywhere
+     */
+    public $docs;
 
-	/**
-	 * @var string ?
-	 * @deprecated Seems unused anywhere
-	 */
-	public $dbversion = "-";
+    /**
+     * @var string ?
+     * @deprecated Seems unused anywhere
+     */
+    public $dbversion = "-";
 
-	/**
-	 * @var string Error message
-	 */
-	public $error;
+    /**
+     * @var string Error message
+     */
+    public $error;
 
-	/**
-	 * @var int Module unique ID
-	 */
-	public $numero;
+    /**
+     * @var int Module unique ID
+     */
+    public $numero;
 
-	/**
-	 * @var string Module name
-	 */
-	public $name;
+    /**
+     * @var string Module name
+     */
+    public $name;
 
-	/**
-	 * @var string Module version
-	 */
-	public $version;
+    /**
+     * @var string Module version
+     */
+    public $version;
 
-	/**
-	 * @var string Module description
-	 */
-	public $description;
+    /**
+     * @var string Module description
+     */
+    public $description;
 
-	/**
-	 * @var string[] Module language files
-	 */
-	public $langfiles;
+    /**
+     * @var string[] Module language files
+     */
+    public $langfiles;
 
-	/**
-	 * @var string Module export code
-	 */
-	public $export_code;
+    /**
+     * @var string Module export code
+     */
+    public $export_code;
 
-	/**
-	 * @var string Module export label
-	 */
-	public $export_label;
+    /**
+     * @var string Module export label
+     */
+    public $export_label;
 
-	/**
-	 * @var string Module import code
-	 */
-	public $import_code;
+    /**
+     * @var string Module import code
+     */
+    public $import_code;
 
-	/**
-	 * @var string Module import label
-	 */
-	public $import_label;
+    /**
+     * @var string Module import label
+     */
+    public $import_label;
 
-	/**
-	 * @var string Module constant name
-	 */
-	public $const_name;
+    /**
+     * @var string Module constant name
+     */
+    public $const_name;
 
-	/**
-	 * @var bool Module can't be disabled
-	 */
-	public $always_enabled;
+    /**
+     * @var bool Module can't be disabled
+     */
+    public $always_enabled;
 
-	/**
-	 * @var bool Module is enabled globally (Multicompany support)
-	 */
-	public $core_enabled;
+    /**
+     * @var bool Module is enabled globally (Multicompany support)
+     */
+    public $core_enabled;
 
-	/**
-	 * Enables a module.
-	 * Inserts all informations into database
-	 *
+    /**
+     * Enables a module.
+     * Inserts all informations into database
+     *
 	 * @param   array  		$array_sql  SQL requests to be executed when enabling module
-	 * @param   string      $options    String with options when disabling module:
-	 *                                    'noboxes' = Do not insert boxes
-	 *                                    'newboxdefonly' = For boxes, insert def of boxes only and not boxes activation
-	 *
-	 * @return  int                         1 if OK, 0 if KO
-	 */
+     * @param   string      $options    String with options when disabling module:
+     *                                    'noboxes' = Do not insert boxes
+     *                                    'newboxdefonly' = For boxes, insert def of boxes only and not boxes activation
+     *
+     * @return  int                         1 if OK, 0 if KO
+     */
     function _init($array_sql, $options='')
     {
         global $conf;
@@ -232,12 +232,12 @@ abstract class DolibarrModules
 
         // Execute addons requests
         $num=count($array_sql);
-    	for ($i = 0; $i < $num; $i++)
+        for ($i = 0; $i < $num; $i++)
         {
             if (! $err)
             {
                 $val=$array_sql[$i];
-	            $sql=$val;
+                $sql=$val;
                 $ignoreerror=0;
                 if (is_array($val))
                 {
@@ -367,12 +367,12 @@ abstract class DolibarrModules
             // If module name translation using it's unique id does not exists, we take use its name to find translation
             if (is_array($this->langfiles))
             {
-            	foreach($this->langfiles as $val)
-            	{
-            		if ($val) $langs->load($val);
-            	}
+                foreach($this->langfiles as $val)
+                {
+                    if ($val) $langs->load($val);
+                }
             }
-       		return $langs->trans($this->name);
+            return $langs->trans($this->name);
         }
     }
 
@@ -389,20 +389,20 @@ abstract class DolibarrModules
 
         if ($langs->trans("Module".$this->numero."Desc") != ("Module".$this->numero."Desc"))
         {
-	        // If module description translation exists
+            // If module description translation exists
             return $langs->trans("Module".$this->numero."Desc");
         }
         else
-		{
+        {
             // If module description translation using it's unique id does not exists, we take use its name to find translation
             if (is_array($this->langfiles))
             {
-            	foreach($this->langfiles as $val)
-            	{
-            		if ($val) $langs->load($val);
-            	}
+                foreach($this->langfiles as $val)
+                {
+                    if ($val) $langs->load($val);
+                }
             }
-       		return $langs->trans($this->description);
+            return $langs->trans($this->description);
         }
     }
 
@@ -429,7 +429,7 @@ abstract class DolibarrModules
         else $ret=$langs->trans("VersionUnknown");
 
         if (preg_match('/_deprecated/',$this->version)) $ret.=' ('.$langs->trans("Deprecated").')';
-		return $ret;
+        return $ret;
     }
 
 
@@ -582,9 +582,9 @@ abstract class DolibarrModules
         global $conf;
 
         $error=0;
-		$dirfound=0;
+        $dirfound=0;
 
-		if (empty($reldir)) return 1;
+        if (empty($reldir)) return 1;
 
         include_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
 
@@ -599,10 +599,10 @@ abstract class DolibarrModules
                 $handle=@opendir($dir);         // Dir may not exists
                 if (is_resource($handle))
                 {
-                	$dirfound++;
+                    $dirfound++;
 
-	                // Run llx_mytable.sql files
-                	while (($file = readdir($handle))!==false)
+                    // Run llx_mytable.sql files
+                    while (($file = readdir($handle))!==false)
                     {
                         if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data')
                         {
@@ -613,8 +613,8 @@ abstract class DolibarrModules
 
                     rewinddir($handle);
 
-	                // Run llx_mytable.key.sql files (Must be done after llx_mytable.sql)
-                	while (($file = readdir($handle))!==false)
+                    // Run llx_mytable.key.sql files (Must be done after llx_mytable.sql)
+                    while (($file = readdir($handle))!==false)
                     {
                         if (preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'llx_' && substr($file,0,4) != 'data')
                         {
@@ -626,7 +626,7 @@ abstract class DolibarrModules
                     rewinddir($handle);
 
                     // Run data_xxx.sql files (Must be done after llx_mytable.key.sql)
-                	while (($file = readdir($handle))!==false)
+                    while (($file = readdir($handle))!==false)
                     {
                         if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,4) == 'data')
                         {
@@ -638,7 +638,7 @@ abstract class DolibarrModules
                     rewinddir($handle);
 
                     // Run update_xxx.sql files
-                	while (($file = readdir($handle))!==false)
+                    while (($file = readdir($handle))!==false)
                     {
                         if (preg_match('/\.sql$/i',$file) && ! preg_match('/\.key\.sql$/i',$file) && substr($file,0,6) == 'update')
                         {
@@ -671,9 +671,9 @@ abstract class DolibarrModules
      */
     function insert_boxes($option='')
     {
-		require_once DOL_DOCUMENT_ROOT . '/core/class/infobox.class.php';
+        require_once DOL_DOCUMENT_ROOT . '/core/class/infobox.class.php';
 
-    	global $conf;
+        global $conf;
 
         $err=0;
 
@@ -681,8 +681,8 @@ abstract class DolibarrModules
         {
             $pos_name = InfoBox::getListOfPagesForBoxes();
 
-			foreach ($this->boxes as $key => $value)
-			{
+            foreach ($this->boxes as $key => $value)
+            {
                 $file  = isset($this->boxes[$key]['file'])?$this->boxes[$key]['file']:'';
                 $note  = isset($this->boxes[$key]['note'])?$this->boxes[$key]['note']:'';
                 $enabledbydefaulton = isset($this->boxes[$key]['enabledbydefaulton'])?$this->boxes[$key]['enabledbydefaulton']:'Home';
@@ -724,15 +724,15 @@ abstract class DolibarrModules
 
                             foreach ($pos_name as $key2 => $val2)
                             {
-                            	//print 'key2='.$key2.'-val2='.$val2."<br>\n";
+                                //print 'key2='.$key2.'-val2='.$val2."<br>\n";
                             	if ($enabledbydefaulton && $val2 != $enabledbydefaulton) continue;		// Not enabled by default onto this page.
 
-	                            $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (box_id,position,box_order,fk_user,entity)";
-    	                        $sql.= " VALUES (".$lastid.", ".$key2.", '0', 0, ".$conf->entity.")";
+                                $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (box_id,position,box_order,fk_user,entity)";
+                                $sql.= " VALUES (".$lastid.", ".$key2.", '0', 0, ".$conf->entity.")";
 
-    	                        dol_syslog(get_class($this)."::insert_boxes onto page ".$key2."=".$val2."", LOG_DEBUG);
-                            	$resql=$this->db->query($sql);
-                            	if (! $resql) $err++;
+                                dol_syslog(get_class($this)."::insert_boxes onto page ".$key2."=".$val2."", LOG_DEBUG);
+                                $resql=$this->db->query($sql);
+                                if (! $resql) $err++;
                             }
                         }
 
@@ -741,7 +741,7 @@ abstract class DolibarrModules
                             $this->db->commit();
                         }
                         else
-						{
+                        {
                             $this->error=$this->db->lasterror();
                             $this->db->rollback();
                         }
@@ -781,11 +781,22 @@ abstract class DolibarrModules
 
                 if (empty($file)) $file  = isset($this->boxes[$key][1])?$this->boxes[$key][1]:'';	// For backward compatibility
 
-                $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
-                $sql.= " USING ".MAIN_DB_PREFIX."boxes, ".MAIN_DB_PREFIX."boxes_def";
-                $sql.= " WHERE ".MAIN_DB_PREFIX."boxes.box_id = ".MAIN_DB_PREFIX."boxes_def.rowid";
-                $sql.= " AND ".MAIN_DB_PREFIX."boxes_def.file = '".$this->db->escape($file)."'";
-                $sql.= " AND ".MAIN_DB_PREFIX."boxes.entity = ".$conf->entity;
+                if ($this->db->type == 'sqlite3') {
+                    // sqlite doesn't support "USING" syntax.
+                    // TODO: remove this dependency.
+                    $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes ";
+                    $sql .= "WHERE ".MAIN_DB_PREFIX."boxes.box_id IN (";
+                    $sql .= "SELECT ".MAIN_DB_PREFIX."boxes_def.rowid ";
+                    $sql .= "FROM ".MAIN_DB_PREFIX."boxes_def ";
+                    $sql .= "WHERE ".MAIN_DB_PREFIX."boxes_def.file = '".$this->db->escape($file)."') ";
+                    $sql .= "AND ".MAIN_DB_PREFIX."boxes.entity = ".$conf->entity;
+                } else {
+                    $sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes";
+                    $sql.= " USING ".MAIN_DB_PREFIX."boxes, ".MAIN_DB_PREFIX."boxes_def";
+                    $sql.= " WHERE ".MAIN_DB_PREFIX."boxes.box_id = ".MAIN_DB_PREFIX."boxes_def.rowid";
+                    $sql.= " AND ".MAIN_DB_PREFIX."boxes_def.file = '".$this->db->escape($file)."'";
+                    $sql.= " AND ".MAIN_DB_PREFIX."boxes.entity = ".$conf->entity;
+                }
 
                 dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
                 $resql=$this->db->query($sql);
@@ -1027,54 +1038,54 @@ abstract class DolibarrModules
 
                     if (empty($r_type)) $r_type='w';
 
-	                // Search if perm already present
-    	            $sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."rights_def";
-        	        $sql.= " WHERE id = ".$r_id." AND entity = ".$entity;
-					$resqlselect=$this->db->query($sql);
+                    // Search if perm already present
+                    $sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."rights_def";
+                    $sql.= " WHERE id = ".$r_id." AND entity = ".$entity;
+                    $resqlselect=$this->db->query($sql);
 
-					$obj = $this->db->fetch_object($resqlselect);
+                    $obj = $this->db->fetch_object($resqlselect);
                     if ($obj->nb == 0)
                     {
-	                    if (dol_strlen($r_perms) )
-	                    {
-	                        if (dol_strlen($r_subperms) )
-	                        {
-	                            $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def";
-	                            $sql.= " (id, entity, libelle, module, type, bydefault, perms, subperms)";
-	                            $sql.= " VALUES ";
-	                            $sql.= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."','".$r_subperms."')";
-	                        }
-	                        else
-	                        {
-	                            $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def";
-	                            $sql.= " (id, entity, libelle, module, type, bydefault, perms)";
-	                            $sql.= " VALUES ";
-	                            $sql.= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."')";
-	                        }
-	                    }
-	                    else
-						{
-	                        $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def ";
-	                        $sql .= " (id, entity, libelle, module, type, bydefault)";
-	                        $sql .= " VALUES ";
-	                        $sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.")";
-	                    }
+                        if (dol_strlen($r_perms) )
+                        {
+                            if (dol_strlen($r_subperms) )
+                            {
+                                $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def";
+                                $sql.= " (id, entity, libelle, module, type, bydefault, perms, subperms)";
+                                $sql.= " VALUES ";
+                                $sql.= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."','".$r_subperms."')";
+                            }
+                            else
+                            {
+                                $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def";
+                                $sql.= " (id, entity, libelle, module, type, bydefault, perms)";
+                                $sql.= " VALUES ";
+                                $sql.= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."')";
+                            }
+                        }
+                        else
+                        {
+                            $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def ";
+                            $sql .= " (id, entity, libelle, module, type, bydefault)";
+                            $sql .= " VALUES ";
+                            $sql .= "(".$r_id.",".$entity.",'".$this->db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.")";
+                        }
 
-                    	$resqlinsert=$this->db->query($sql,1);
+                        $resqlinsert=$this->db->query($sql,1);
 
-	                    if (! $resqlinsert)
-	                    {
-	                        if ($this->db->errno() != "DB_ERROR_RECORD_ALREADY_EXISTS")
-	                        {
-	                            $this->error=$this->db->lasterror();
-	                            $err++;
-	                            break;
-	                        }
-	                        else dol_syslog(get_class($this)."::insert_permissions record already exists", LOG_INFO);
+                        if (! $resqlinsert)
+                        {
+                            if ($this->db->errno() != "DB_ERROR_RECORD_ALREADY_EXISTS")
+                            {
+                                $this->error=$this->db->lasterror();
+                                $err++;
+                                break;
+                            }
+                            else dol_syslog(get_class($this)."::insert_permissions record already exists", LOG_INFO);
 
-	                    }
+                        }
 
-	                    $this->db->free($resqlinsert);
+                        $this->db->free($resqlinsert);
                     }
 
                     $this->db->free($resqlselect);
@@ -1082,9 +1093,9 @@ abstract class DolibarrModules
                     // If we want to init permissions on admin users
                     if ($reinitadminperms)
                     {
-                    	if (! class_exists('User')) {
-							require DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
-                    	}
+                        if (! class_exists('User')) {
+                            require DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
+                        }
                         $sql="SELECT rowid FROM ".MAIN_DB_PREFIX."user WHERE admin = 1";
                         dol_syslog(get_class($this)."::insert_permissions Search all admin users", LOG_DEBUG);
                         $resqlseladmin=$this->db->query($sql,1);
@@ -1099,7 +1110,7 @@ abstract class DolibarrModules
                                 $tmpuser=new User($this->db);
                                 $tmpuser->fetch($obj2->rowid);
                                 if (!empty($tmpuser->id)) {
-                                	$tmpuser->addrights($r_id);
+                                    $tmpuser->addrights($r_id);
                                 }
                                 $i++;
                             }
@@ -1158,7 +1169,7 @@ abstract class DolibarrModules
      */
     function insert_menus()
     {
-    	global $user;
+        global $user;
 
         require_once DOL_DOCUMENT_ROOT . '/core/class/menubase.class.php';
 
@@ -1415,68 +1426,68 @@ abstract class DolibarrModules
      */
     function insert_module_parts()
     {
-    	global $conf;
+        global $conf;
 
-    	$error=0;
-    	$entity=$conf->entity;
+        $error=0;
+        $entity=$conf->entity;
 
-    	if (is_array($this->module_parts) && ! empty($this->module_parts))
-    	{
-    		foreach($this->module_parts as $key => $value)
-    		{
+        if (is_array($this->module_parts) && ! empty($this->module_parts))
+        {
+            foreach($this->module_parts as $key => $value)
+            {
     			if (is_array($value) && count($value) == 0) continue;	// Discard empty arrays
 
-    			$newvalue = $value;
+                $newvalue = $value;
 
-    			// Serialize array parameters
-    			if (is_array($value))
-    			{
-    				// Can defined other parameters
-    				if (is_array($value['data']) && ! empty($value['data']))
-    				{
-    					$newvalue = json_encode($value['data']);
-    					if (isset($value['entity'])) $entity = $value['entity'];
-    				}
-    				else
-    				{
-    					$newvalue = json_encode($value);
-    				}
-    			}
+                // Serialize array parameters
+                if (is_array($value))
+                {
+                    // Can defined other parameters
+                    if (is_array($value['data']) && ! empty($value['data']))
+                    {
+                        $newvalue = json_encode($value['data']);
+                        if (isset($value['entity'])) $entity = $value['entity'];
+                    }
+                    else
+                    {
+                        $newvalue = json_encode($value);
+                    }
+                }
 
-    			$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (";
-    			$sql.= "name";
-    			$sql.= ", type";
-    			$sql.= ", value";
-    			$sql.= ", note";
-    			$sql.= ", visible";
-    			$sql.= ", entity";
-    			$sql.= ")";
-    			$sql.= " VALUES (";
-    			$sql.= $this->db->encrypt($this->const_name."_".strtoupper($key), 1);
-    			$sql.= ", 'chaine'";
-    			$sql.= ", ".$this->db->encrypt($newvalue, 1);
-    			$sql.= ", null";
-    			$sql.= ", '0'";
-    			$sql.= ", ".$entity;
-    			$sql.= ")";
+                $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (";
+                $sql.= "name";
+                $sql.= ", type";
+                $sql.= ", value";
+                $sql.= ", note";
+                $sql.= ", visible";
+                $sql.= ", entity";
+                $sql.= ")";
+                $sql.= " VALUES (";
+                $sql.= $this->db->encrypt($this->const_name."_".strtoupper($key), 1);
+                $sql.= ", 'chaine'";
+                $sql.= ", ".$this->db->encrypt($newvalue, 1);
+                $sql.= ", null";
+                $sql.= ", '0'";
+                $sql.= ", ".$entity;
+                $sql.= ")";
 
-    			dol_syslog(get_class($this)."::insert_const_".$key."", LOG_DEBUG);
-    			$resql=$this->db->query($sql,1);
-    			if (! $resql)
-    			{
-    			    if ($this->db->lasterrno() != 'DB_ERROR_RECORD_ALREADY_EXISTS')
-    			    {
-        			    $error++;
-        				$this->error=$this->db->lasterror();
-    			    }
-    			    else
-    			    {
-    			        dol_syslog(get_class($this)."::insert_const_".$key." Record already exists.", LOG_WARNING);
-    			    }
-    			}
-    		}
-    	}
-    	return $error;
+                dol_syslog(get_class($this)."::insert_const_".$key."", LOG_DEBUG);
+                $resql=$this->db->query($sql,1);
+                if (! $resql)
+                {
+                    if ($this->db->lasterrno() != 'DB_ERROR_RECORD_ALREADY_EXISTS')
+                    {
+                        $error++;
+                        $this->error=$this->db->lasterror();
+                    }
+                    else
+                    {
+                        dol_syslog(get_class($this)."::insert_const_".$key." Record already exists.", LOG_WARNING);
+                    }
+                }
+            }
+        }
+        return $error;
     }
 
     /**
@@ -1486,31 +1497,31 @@ abstract class DolibarrModules
      */
     function delete_module_parts()
     {
-    	global $conf;
+        global $conf;
 
-    	$err=0;
-    	$entity=$conf->entity;
+        $err=0;
+        $entity=$conf->entity;
 
-    	if (is_array($this->module_parts) && ! empty($this->module_parts))
-    	{
-    		foreach($this->module_parts as $key => $value)
-    		{
-    			// If entity is defined
-    			if (is_array($value) && isset($value['entity'])) $entity = $value['entity'];
+        if (is_array($this->module_parts) && ! empty($this->module_parts))
+        {
+            foreach($this->module_parts as $key => $value)
+            {
+                // If entity is defined
+                if (is_array($value) && isset($value['entity'])) $entity = $value['entity'];
 
-    			$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
-    			$sql.= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->const_name."_".strtoupper($key)."'";
-    			$sql.= " AND entity = ".$entity;
+                $sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
+                $sql.= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->const_name."_".strtoupper($key)."'";
+                $sql.= " AND entity = ".$entity;
 
-    			dol_syslog(get_class($this)."::delete_const_".$key."", LOG_DEBUG);
-    			if (! $this->db->query($sql))
-    			{
-    				$this->error=$this->db->lasterror();
-    				$err++;
-    			}
-    		}
-    	}
-    	return $err;
+                dol_syslog(get_class($this)."::delete_const_".$key."", LOG_DEBUG);
+                if (! $this->db->query($sql))
+                {
+                    $this->error=$this->db->lasterror();
+                    $err++;
+                }
+            }
+        }
+        return $err;
     }
 
 }
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index 50d5ee27b55..7b39fa06cf7 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -86,12 +86,15 @@ if (! is_writable($conffile))
 
 
 // Check parameters
+$is_sqlite = false;
 if (empty($db_type))
 {
     print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DatabaseType")).'</div>';
     $error++;
+} else {
+	$is_sqlite = ($db_type === 'sqlite' || $db_type === 'sqlite3' );
 }
-if (empty($db_host))
+if (empty($db_host) && ! $is_sqlite)
 {
     print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Server")).'</div>';
     $error++;
@@ -101,7 +104,7 @@ if (empty($db_name))
     print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("DatabaseName")).'</div>';
     $error++;
 }
-if (empty($db_user))
+if (empty($db_user)  && ! $is_sqlite)
 {
     print '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("Login")).'</div>';
     $error++;
diff --git a/index.php b/index.php
deleted file mode 100644
index e4341bb53ec..00000000000
--- a/index.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-	header('Location: htdocs');
\ No newline at end of file

From 0d801be6a1563f1c6b39683ab901b2ea69dce3b0 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri, 6 Mar 2015 06:12:47 +0100
Subject: [PATCH 26/93] NEW: (Dev) DolGraph allow extended class to override
 $_stringtoshow

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

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index c400dc151d3..5451d7457ce 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -65,7 +65,7 @@ class DolGraph
 	var $bgcolorgrid=array(255,255,255);			// array(R,G,B)
 	var $datacolor;				// array(array(R,G,B),...)
 
-	private $_stringtoshow;      // To store string to output graph into HTML page
+	protected $_stringtoshow;      // To store string to output graph into HTML page
 
 
 	/**

From 9a7346f8895e54ef6e4727c87837b4726522b2bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garc=C3=ADa?= <marcosgdf@gmail.com>
Date: Fri, 6 Mar 2015 12:09:23 +0100
Subject: [PATCH 27/93] Update ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index e861f04ae86..0664bda856d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@ English Dolibarr ChangeLog
 - Fix: [ bug #1827 ] Tax reports gives incorrect amounts when using external modules that create lines with special codes
 - Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL
 - Fix: [ bug #1832 ] SQL error when adding a product with no price defined to an object
+- Fix: [ bug #1833 ] user permissions in contact/note.php not working
 - Fix: [ bug #1826 ] Supplier payment types are not translated into fourn/facture/paiement.php
 - Fix: [ bug #1830 ] Salaries payment only allows checking accounts
 - Fix: [ bug #1825 ] External agenda: hide/show checkbox doesn't work

From df305bd31661351190d95fff91323b4bf840fb5b Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 7 Mar 2015 15:01:30 +0100
Subject: [PATCH 28/93] Deactivate conflict with Mod Deplacement - Need to
 access on old data

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

diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index 5d826ae9a54..cf106fa4588 100755
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -84,7 +84,7 @@ class modExpenseReport extends DolibarrModules
 
 		// Dependencies
 		$this->depends = array();		// List of modules id that must be enabled if this module is enabled
-		$this->conflictwith = array("modDeplacement");
+		// $this->conflictwith = array("modDeplacement"); // Deactivate for access on old information
 		$this->requiredby = array();	// List of modules id to disable if this one is disabled
 		$this->phpmin = array(4,3);					// Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3,7);	// Minimum version of Dolibarr required by module

From 402e0c8ad5d90a33cc107b68cc597d9836f862d0 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 7 Mar 2015 15:06:45 +0100
Subject: [PATCH 29/93] Add condition to access on dictionary c_type_fees when
 the module is enabled

---
 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 05402898ee6..8de52ef73c5 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2011      Remy Younes          <ryounes@gmail.com>
  * Copyright (C) 2012-2013 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2012      Christophe Battarel	<christophe.battarel@ltairis.fr>
- * Copyright (C) 2011-2014 Alexandre Spangaro	<alexandre.spangaro@gmail.com>
+ * Copyright (C) 2011-2015 Alexandre Spangaro	<alexandre.spangaro@gmail.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
@@ -316,7 +316,7 @@ $tabcond[13]= (! empty($conf->commande->enabled) || ! empty($conf->propal->enabl
 $tabcond[14]= (! empty($conf->product->enabled) && ! empty($conf->ecotax->enabled));
 $tabcond[15]= true;
 $tabcond[16]= (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS));
-$tabcond[17]= ! empty($conf->deplacement->enabled);
+$tabcond[17]= (! empty($conf->deplacement->enabled) || ! empty($conf->expensereport->enabled));
 $tabcond[18]= ! empty($conf->expedition->enabled);
 $tabcond[19]= ! empty($conf->societe->enabled);
 $tabcond[20]= ! empty($conf->fournisseur->enabled);

From f780e908f419cf49421177870283050765368eba Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 7 Mar 2015 15:14:51 +0100
Subject: [PATCH 30/93] Add index.html

---
 htdocs/expensereport/ajax/index.html  | 0
 htdocs/expensereport/class/index.html | 0
 htdocs/expensereport/index.html       | 0
 htdocs/expensereport/stats/index.html | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 htdocs/expensereport/ajax/index.html
 create mode 100644 htdocs/expensereport/class/index.html
 create mode 100644 htdocs/expensereport/index.html
 create mode 100644 htdocs/expensereport/stats/index.html

diff --git a/htdocs/expensereport/ajax/index.html b/htdocs/expensereport/ajax/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/expensereport/class/index.html b/htdocs/expensereport/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/expensereport/index.html b/htdocs/expensereport/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/expensereport/stats/index.html b/htdocs/expensereport/stats/index.html
new file mode 100644
index 00000000000..e69de29bb2d

From 1baf71874ccf9a9e366a39db617f284f6e70e4cf Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 7 Mar 2015 15:31:23 +0100
Subject: [PATCH 31/93] Sql & $_SERVER["PHP_SELF"]

---
 htdocs/expensereport/card.php                 | 10 +++++-----
 .../class/expensereport.class.php             | 20 +++++++++----------
 htdocs/expensereport/list.php                 | 10 +++++-----
 htdocs/expensereport/synchro_compta.php       | 18 ++++++++---------
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 86c113c24da..345d983b2f6 100755
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -733,12 +733,12 @@ if ($action == "confirm_paid" && GETPOST('confirm')=="yes" && $id > 0 && $user->
 			$insertid = $acct->addline($dateop, $operation, $label, $amount, $num_chq, $cat1, $user);
 
 			if ($insertid > 0):
-			$sql = " UPDATE ".MAIN_DB_PREFIX."expensereport d";
+			$sql = " UPDATE ".MAIN_DB_PREFIX."expensereport as d";
 			$sql.= " SET integration_compta = 1, fk_bank_account = $idAccount";
 			$sql.= " WHERE rowid = $idTrip";
 			$resql=$db->query($sql);
 			if($result):
-			Header("Location: ".$_SEVER["PHP_SELF"]."?id=".$id);
+			Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 			exit;
 			else:
 			dol_print_error($db);
@@ -1529,9 +1529,9 @@ else
 				$sql.= ' fde.fk_c_tva as vatrate, fde.comments, fde.qty, fde.value_unit, fde.total_ht, fde.total_tva, fde.total_ttc,';
 				$sql.= ' ctf.code as type_fees_code, ctf.label as type_fees_libelle,';
 				$sql.= ' pjt.rowid as projet_id, pjt.title as projet_title, pjt.ref as projet_ref';
-				$sql.= ' FROM '.MAIN_DB_PREFIX.'expensereport_det fde';
-				$sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'c_type_fees ctf ON fde.fk_c_type_fees=ctf.id';
-				$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet pjt ON fde.fk_projet=pjt.rowid';
+				$sql.= ' FROM '.MAIN_DB_PREFIX.'expensereport_det as fde';
+				$sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON fde.fk_c_type_fees=ctf.id';
+				$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pjt ON fde.fk_projet=pjt.rowid';
 				$sql.= ' WHERE fde.fk_expensereport = '.$id;
 
 				$resql = $db->query($sql);
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index b31329fae95..c34edc5ff79 100755
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -270,7 +270,7 @@ class ExpenseReport extends CommonObject
 		$sql.= " d.fk_user_author, d.fk_user_validator, d.fk_c_expensereport_statuts as status, d.fk_c_paiement,";
 		$sql.= " d.fk_user_valid, d.fk_user_approve, d.fk_user_paid,";
 		$sql.= " dp.libelle as libelle_paiement, dp.code as code_paiement";								// INNER JOIN paiement
-		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." d LEFT JOIN ".MAIN_DB_PREFIX."c_paiement dp ON d.fk_c_paiement = dp.id";
+		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as d LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as dp ON d.fk_c_paiement = dp.id";
 		if ($ref) $sql.= " WHERE d.ref = '".$this->db->escape($ref)."'";
 		else $sql.= " WHERE d.rowid = ".$id;
 		$sql.= $restrict;
@@ -707,8 +707,8 @@ class ExpenseReport extends CommonObject
 		$sql.= ' ctf.code as code_type_fees, ctf.label as libelle_type_fees,';
 		$sql.= ' p.ref as ref_projet, p.title as title_projet';
 		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line.' as de';
-		$sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'c_type_fees ctf ON de.fk_c_type_fees = ctf.id';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet p ON de.fk_projet = p.rowid';
+		$sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON de.fk_c_type_fees = ctf.id';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON de.fk_projet = p.rowid';
 		$sql.= ' WHERE de.'.$this->fk_element.' = '.$this->id;
 
 		dol_syslog('ExpenseReport::fetch_lines sql='.$sql, LOG_DEBUG);
@@ -1186,7 +1186,7 @@ class ExpenseReport extends CommonObject
 
 			// Select du taux de tva par rapport au code
 			$sql = "SELECT t.taux as taux_tva";
-			$sql.= " FROM ".MAIN_DB_PREFIX."c_tva t";
+			$sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t";
 			$sql.= " WHERE t.rowid = ".$c_tva;
 			$result = $this->db->query($sql);
 			$objp_tva = $this->db->fetch_object($result);
@@ -1222,7 +1222,7 @@ class ExpenseReport extends CommonObject
 
 			// Select des infos sur le type fees
 			$sql = "SELECT c.code as code_type_fees, c.label as libelle_type_fees";
-			$sql.= " FROM ".MAIN_DB_PREFIX."c_type_fees c";
+			$sql.= " FROM ".MAIN_DB_PREFIX."c_type_fees as c";
 			$sql.= " WHERE c.id = ".$type_fees_id;
 			$result = $this->db->query($sql);
 			$objp_fees = $this->db->fetch_object($result);
@@ -1231,7 +1231,7 @@ class ExpenseReport extends CommonObject
 
 			// Select des informations du projet
 			$sql = "SELECT p.ref as ref_projet, p.title as title_projet";
-			$sql.= " FROM ".MAIN_DB_PREFIX."projet p";
+			$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
 			$sql.= " WHERE p.rowid = ".$projet_id;
 			$result = $this->db->query($sql);
 			$objp_projet = $this->db->fetch_object($result);
@@ -1460,9 +1460,9 @@ class ExpenseReportLine
 		$sql.= ' fde.fk_c_tva as tva_taux, fde.comments, fde.qty, fde.value_unit, fde.total_ht, fde.total_tva, fde.total_ttc,';
 		$sql.= ' ctf.code as type_fees_code, ctf.label as type_fees_libelle,';
 		$sql.= ' pjt.rowid as projet_id, pjt.title as projet_title, pjt.ref as projet_ref';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'expensereport_det fde';
-		$sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'c_type_fees ctf ON fde.fk_c_type_fees=ctf.id';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet pjt ON fde.fk_projet=pjt.rowid';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'expensereport_det as fde';
+		$sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON fde.fk_c_type_fees=ctf.id';
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pjt ON fde.fk_projet=pjt.rowid';
 		$sql.= ' WHERE fde.rowid = '.$rowid;
 
 		$result = $this->db->query($sql);
@@ -1708,4 +1708,4 @@ function select_type_fees_id($selected='',$htmlname='type',$showempty=0)
 		}
 	}
 	print '</select>';
-}
+}
\ No newline at end of file
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index d6700ac26a2..76a72836e17 100755
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -88,16 +88,16 @@ $pagenext = $page + 1;
 $sql = "SELECT d.rowid, d.ref, d.total_ht, d.total_tva, d.total_ttc, d.fk_c_expensereport_statuts as status,";
 $sql.= " d.date_debut, d.date_fin,";
 $sql.= " u.rowid as id_user, u.firstname, u.lastname";
-$sql.= " FROM ".MAIN_DB_PREFIX."expensereport d\n";
-$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user u ON d.fk_user_author = u.rowid\n";
+$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d";
+$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON d.fk_user_author = u.rowid";
 
 
 
 // WHERE
 if(!empty($search_ref)){
-	$sql.= " WHERE d.ref LIKE '%".$db->escape($search_ref)."%'\n";
+	$sql.= " WHERE d.ref LIKE '%".$db->escape($search_ref)."%'";
 }else{
-	$sql.= " WHERE 1 = 1\n";
+	$sql.= " WHERE 1 = 1";
 }
 // DATE START
 if ($month_start > 0) {
@@ -156,7 +156,7 @@ if ($month_start > 0) {
 		}
 	}
 }
-if (!empty($search_user) && $search_user > 0) $sql.= " AND d.fk_user_author = ".$search_user."\n";
+if (!empty($search_user) && $search_user > 0) $sql.= " AND d.fk_user_author = '".$search_user."'";
 if($search_state != '') $sql.= " AND d.fk_c_expensereport_statuts = '$search_state'\n";
 
 // RESTRICT RIGHTS
diff --git a/htdocs/expensereport/synchro_compta.php b/htdocs/expensereport/synchro_compta.php
index b8f7760e409..a436f92e682 100755
--- a/htdocs/expensereport/synchro_compta.php
+++ b/htdocs/expensereport/synchro_compta.php
@@ -49,12 +49,12 @@ if ($_GET["action"] == 'confirm_ndf_to_account' && $_GET["confirm"] == "yes"):
 	$insertid = $acct->addline($dateop, $operation, $label, $amount, $num_chq, $cat1, $user);
 
 	if ($insertid > 0):
-		$sql = " UPDATE ".MAIN_DB_PREFIX."expensereport d";
+		$sql = " UPDATE ".MAIN_DB_PREFIX."expensereport as d";
 		$sql.= " SET integration_compta = 1, fk_bank_account = $idAccount";
 		$sql.= " WHERE rowid = $idTrip";
 		$resql=$db->query($sql);
 		if($result):
-			Header("Location: synchro_compta.php?account=".$idAccount);
+			Header("Location: ".$_SERVER["PHP_SELF"]."?account=".$idAccount);
 			exit;
 		else:
 			dol_print_error($db);
@@ -75,12 +75,12 @@ if ($_GET["action"] == 'confirm_account_to_ndf' && $_GET["confirm"] == "yes"):
 	$sql.= " WHERE label LIKE '%".$expensereport->ref."%'";
 	$resql=$db->query($sql);
 	if ($resql > 0):
-		$sql = " UPDATE ".MAIN_DB_PREFIX."expensereport d";
+		$sql = " UPDATE ".MAIN_DB_PREFIX."expensereport as d";
 		$sql.= " SET integration_compta = 0, fk_bank_account = 0";
 		$sql.= " WHERE rowid = $idTrip";
 		$resql=$db->query($sql);
 		if($result):
-			Header("Location: synchro_compta.php?account=".$idAccount);
+			Header("Location: ".$_SERVER["PHP_SELF"]."?account=".$idAccount);
 			exit;
 		else:
 			dol_print_error($db);
@@ -110,13 +110,13 @@ dol_fiche_head('');
 
 if ($_GET["action"] == 'ndfTOaccount'):
 	$idTrip = $_GET['idTrip'];
-	$ret=$html->form_confirm("synchro_compta.php?idTrip=".$idTrip."&account=".$idAccount,$langs->trans("ndfToAccount"),$langs->trans("ConfirmNdfToAccount"),"confirm_ndf_to_account","","",1);
+	$ret=$html->form_confirm($_SERVER["PHP_SELF"]."?idTrip=".$idTrip."&account=".$idAccount,$langs->trans("ndfToAccount"),$langs->trans("ConfirmNdfToAccount"),"confirm_ndf_to_account","","",1);
 	if ($ret == 'html') print '<br />';
 endif;
 
 if ($_GET["action"] == 'accountTOndf'):
 	$idTrip = $_GET['idTrip'];
-	$ret=$html->form_confirm("synchro_compta.php?idTrip=".$idTrip."&account=".$idAccount,$langs->trans("AccountToNdf"),$langs->trans("ConfirmAccountToNdf"),"confirm_account_to_ndf","","",1);
+	$ret=$html->form_confirm($_SERVER["PHP_SELF"]."?idTrip=".$idTrip."&account=".$idAccount,$langs->trans("AccountToNdf"),$langs->trans("ConfirmAccountToNdf"),"confirm_account_to_ndf","","",1);
 	if ($ret == 'html') print '<br />';
 endif;
 
@@ -138,8 +138,8 @@ else:
 
 	$sql = "SELECT d.fk_bank_account, d.ref, d.rowid, d.date_valid, d.fk_user_author, d.total_ttc, d.integration_compta, d.fk_c_expensereport_statuts";
 	$sql.= " ,CONCAT(u.firstname,' ',u.lastname) as declarant_NDF";
-	$sql.= " FROM ".MAIN_DB_PREFIX."expensereport d";
-	$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user u ON d.fk_user_author = u.rowid";
+	$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d";
+	$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON d.fk_user_author = u.rowid";
 	$sql.= " WHERE d.fk_c_expensereport_statuts = 6";
 	$sql.= " ORDER BY d.date_valid DESC";
 
@@ -200,7 +200,7 @@ else:
 			print "</table>";
 
 		else:
-			print '<div class="error">'.$langs->trans("AucuneTripToSynch").'</div>';
+			print '<div class="error">'.$langs->trans("NoTripToSync").'</div>';
 		endif;
 
 		$db->free($resql);

From 2c738df1970fd460bbd65e955573801dc2e186a0 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 7 Mar 2015 15:34:58 +0100
Subject: [PATCH 32/93] Add GPLV3 & Copyright

---
 .../class/expensereport.class.php             | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index c34edc5ff79..e1ddbc6198b 100755
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1,5 +1,22 @@
 <?php
-require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
+/* Copyright (C) 2011 Dimitri Mouillard   <dmouillard@teclib.com>
+ * Copyright (C) 2015 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/>.
+ */
+
+require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
 
 /**
  * Class to manage Trips and Expenses

From 55db57d10c8fd8c0eeb5acc3186892bc3af25ef0 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 7 Mar 2015 15:41:30 +0100
Subject: [PATCH 33/93] Path

---
 htdocs/expensereport/class/expensereportstats.class.php | 4 ++--
 htdocs/expensereport/export_csv.php                     | 4 ++--
 htdocs/expensereport/index.php                          | 4 ++--
 htdocs/expensereport/list.php                           | 4 ++--
 htdocs/expensereport/synchro_compta.php                 | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/expensereport/class/expensereportstats.class.php b/htdocs/expensereport/class/expensereportstats.class.php
index 9536d59937d..5d71be15738 100644
--- a/htdocs/expensereport/class/expensereportstats.class.php
+++ b/htdocs/expensereport/class/expensereportstats.class.php
@@ -19,11 +19,11 @@
 
 /**
  *       \file       htdocs/expensereport/class/expensereportstats.class.php
- *       \ingroup    factures
+ *       \ingroup    ExpenseReport
  *       \brief      Fichier de la classe de gestion des stats des expensereport et notes de frais
  */
 include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php';
-dol_include_once('/expensereport/class/expensereport.class.php');
+include_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 
 /**
  *  Classe permettant la gestion des stats des expensereports et notes de frais
diff --git a/htdocs/expensereport/export_csv.php b/htdocs/expensereport/export_csv.php
index 05036deaf7c..8228eb68532 100755
--- a/htdocs/expensereport/export_csv.php
+++ b/htdocs/expensereport/export_csv.php
@@ -21,8 +21,8 @@
  */
 
 require '../main.inc.php';
-require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
-dol_include_once("/expensereport/class/expensereport.class.php");
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 
 $langs->load("users");
 $langs->load("trips");
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 89469609e2a..b90e6416192 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -25,8 +25,8 @@
  */
 
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
-dol_include_once("/expensereport/class/expensereport.class.php");
+require_once DOL_DOCUMENT_ROOT . '/compta/tva/class/tva.class.php';
+require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 
 $langs->load("companies");
 $langs->load("users");
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 76a72836e17..44f1426fd36 100755
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -25,8 +25,8 @@
  */
 
 require "../main.inc.php";
-dol_include_once("/expensereport/class/expensereport.class.php");
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
 
 $langs->load("companies");
 $langs->load("users");
diff --git a/htdocs/expensereport/synchro_compta.php b/htdocs/expensereport/synchro_compta.php
index a436f92e682..ec2703d059a 100755
--- a/htdocs/expensereport/synchro_compta.php
+++ b/htdocs/expensereport/synchro_compta.php
@@ -16,8 +16,8 @@
  */
 
 require '../main.inc.php';
-require_once(DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php');
-dol_include_once("/expensereport/class/expensereport.class.php");
+require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 
 $langs->load("companies");
 $langs->load("users");

From 26b1f6902548a7b86c66283bb863695718ba3d7c Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sat, 7 Mar 2015 15:47:08 +0100
Subject: [PATCH 34/93] Add traduction on type label

---
 .../class/expensereport.class.php             | 33 +++++++++++++++++++
 htdocs/expensereport/index.php                |  3 +-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index e1ddbc6198b..c14c7ff2be7 100755
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -1420,6 +1420,39 @@ class ExpenseReport extends CommonObject
 
 		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
+	
+	/**
+	 * List of types
+	 *
+	 * @param	int		$active		Active or not
+	 * @return	array
+	 */
+	function listOfTypes($active=1)
+	{
+		global $langs;
+		$ret=array();
+		$sql = "SELECT id, code, label";
+		$sql.= " FROM ".MAIN_DB_PREFIX."c_type_fees";
+		$sql.= " WHERE active = ".$active;
+		dol_syslog(get_class($this)."::listOfTypes", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ( $result )
+		{
+			$num = $this->db->num_rows($result);
+			$i=0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
+				$ret[$obj->code]=(($langs->trans($obj->code)!=$obj->code)?$langs->trans($obj->code):$obj->label);
+				$i++;
+			}
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+		return $ret;
+	}
 
 }
 
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index b90e6416192..ec9ccba2c0b 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -111,8 +111,7 @@ print '<tr class="liste_titre">';
 print '<td colspan="4">'.$langs->trans("Statistics").'</td>';
 print "</tr>\n";
 
-//$listoftype=$tripandexpense_static->listOfTypes();
-$listoftype=$label;
+$listoftype=$tripandexpense_static->listOfTypes();
 foreach ($listoftype as $code => $label)
 {
     $dataseries[]=array('label'=>$label,'data'=>(isset($somme[$code])?(int) $somme[$code]:0));

From f3258d59c6f97e192256815dd5cb002c3f78749b Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sun, 8 Mar 2015 07:21:07 +0100
Subject: [PATCH 35/93] Uniformize status & add price()

---
 htdocs/compta/hrm.php                         |  8 +--
 htdocs/expensereport/card.php                 | 44 +++++++--------
 .../class/expensereport.class.php             | 54 +++++++++----------
 .../class/expensereportstats.class.php        |  2 +-
 htdocs/expensereport/index.php                |  6 +--
 htdocs/expensereport/list.php                 |  4 +-
 htdocs/expensereport/synchro_compta.php       |  4 +-
 .../install/mysql/migration/3.7.0-3.8.0.sql   |  2 +-
 .../mysql/tables/llx_expensereport.sql        |  2 +-
 9 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/htdocs/compta/hrm.php b/htdocs/compta/hrm.php
index 866399ef1cc..59389f41d51 100644
--- a/htdocs/compta/hrm.php
+++ b/htdocs/compta/hrm.php
@@ -196,7 +196,7 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
 
 if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 {
-	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, x.rowid, x.date_debut as date, x.tms as dm, x.total_ttc";
+	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, x.rowid, x.date_debut as date, x.tms as dm, x.total_ttc, x.fk_statut as status";
 	$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as x, ".MAIN_DB_PREFIX."user as u";
 	if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql.= " WHERE u.rowid = x.fk_user_author";
@@ -218,7 +218,7 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
 		print '<td colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses",min($max,$num)).'</td>';
-		print '<td align="right">'.$langs->trans("FeesAmount").'</td>';
+		print '<td align="right">'.$langs->trans("TotalTTC").'</td>';
 		print '<td align="right">'.$langs->trans("DateModificationShort").'</td>';
 		print '<td width="16">&nbsp;</td>';
 		print '</tr>';
@@ -239,9 +239,9 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
 				print '<tr '.$bc[$var].'>';
 				print '<td>'.$expensereportstatic->getNomUrl(1).'</td>';
 				print '<td>'.$userstatic->getNomUrl(1).'</td>';
-				print '<td align="right">'.$obj->total_ttc.'</td>';
+				print '<td align="right">'.price($obj->total_ttc).'</td>';
 				print '<td align="right">'.dol_print_date($db->jdate($obj->dm),'day').'</td>';
-				//print '<td>'.$expensereportstatic->LibStatut($obj->fk_statut,3).'</td>';
+				print '<td>'.$expensereportstatic->LibStatut($obj->status,3).'</td>';
 				print '</tr>';
 				$var=!$var;
 				$i++;
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 345d983b2f6..02d899def0a 100755
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -109,7 +109,7 @@ if ($action == 'add' && $user->rights->expensereport->creer)
 	$object->date_debut = $date_start;
 	$object->date_fin = $date_end;
 
-	$object->fk_c_expensereport_statuts = 1;
+	$object->fk_statut = 1;
 	$object->fk_c_paiement				= GETPOST('fk_c_paiement','int');
 	$object->fk_user_validator			= GETPOST('fk_user_validator','int');
 	$object->note_public				= GETPOST('note_public');
@@ -151,7 +151,7 @@ if ($action == 'update' && $user->rights->expensereport->creer)
 	$object->date_debut = $date_start;
 	$object->date_fin = $date_end;
 
-	if($object->fk_c_expensereport_statuts < 3)
+	if($object->fk_statut < 3)
 	{
 		$object->fk_user_validator = GETPOST('fk_user_validator','int');
 	}
@@ -1197,7 +1197,7 @@ else
 
 			$head = expensereport_prepare_head($object);
 
-			if ($action == 'edit' && ($object->fk_c_expensereport_statuts < 3 || $object->fk_c_expensereport_statuts==99))
+			if ($action == 'edit' && ($object->fk_statut < 3 || $object->fk_statut==99))
 			{
 				print "<form name='update' action=\"".$_SERVER['PHP_SELF']."\" method=\"post\">\n";
 				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -1205,7 +1205,7 @@ else
 
 				dol_fiche_head($head, 'card', $langs->trans("TripCard"), 0, 'trip');
 
-				if($object->fk_c_expensereport_statuts==99)
+				if($object->fk_statut==99)
 				{
 					print '<input type="hidden" name="action" value="updateFromRefuse">';
 				}
@@ -1246,7 +1246,7 @@ else
 					print '</tr>';
 				}
 
-				if($object->fk_c_expensereport_statuts<3)
+				if($object->fk_statut<3)
 				{
 					print '<tr>';
 					print '<td>'.$langs->trans("VALIDATOR").'</td>';	// Approbator
@@ -1275,7 +1275,7 @@ else
 				$userfee->fetch($object->fk_user_author);
 				print $userfee->getNomUrl(1);
 				print '</td></tr>';
-				if ($object->fk_c_expensereport_statuts==6)
+				if ($object->fk_statut==6)
 				{
 					print '<tr>';
 					print '<td>'.$langs->trans("AUTHORPAIEMENT").'</td>';
@@ -1437,7 +1437,7 @@ else
 				print '<td>'.$langs->trans("DATE_SAVE").'</td>';
 				print '<td>'.dol_print_date($object->date_create,'dayhour').'</td></tr>';
 				print '</tr>';
-				if($object->fk_c_expensereport_statuts==6)
+				if($object->fk_statut==6)
 				{
 					print '<tr>';
 					print '<td>'.$langs->trans("AUTHORPAIEMENT").'</td>';
@@ -1452,7 +1452,7 @@ else
 					print '</tr>';
 				}
 
-				if($object->fk_c_expensereport_statuts<3)	// informed
+				if($object->fk_statut<3)	// informed
 				{
 					print '<tr>';
 					print '<td>'.$langs->trans("VALIDATOR").'</td>';
@@ -1465,7 +1465,7 @@ else
 					}
 					print '</td></tr>';
 				}
-				elseif($object->fk_c_expensereport_statuts==4)
+				elseif($object->fk_statut==4)
 				{
 					print '<tr>';
 					print '<td>'.$langs->trans("CANCEL_USER").'</span></td>';
@@ -1504,7 +1504,7 @@ else
 					print '</tr>';
 				}
 
-				if($object->fk_c_expensereport_statuts==99 || !empty($object->detail_refuse))
+				if($object->fk_statut==99 || !empty($object->detail_refuse))
 				{
 					print '<tr>';
 					print '<td>'.$langs->trans("REFUSEUR").'</td>';
@@ -1566,7 +1566,7 @@ else
 							print '<td style="text-align:right;">'.$langs->trans('AmountTTC').'</td>';
 						}
 						// Ajout des boutons de modification/suppression
-						if ($object->fk_c_expensereport_statuts < 2 || $object->fk_c_expensereport_statuts==99)
+						if ($object->fk_statut < 2 || $object->fk_statut==99)
 						{
 							print '<td style="text-align:right;"></td>';
 						}
@@ -1609,7 +1609,7 @@ else
 								}
 
 								// Ajout des boutons de modification/suppression
-								if($object->fk_c_expensereport_statuts<2 OR $object->fk_c_expensereport_statuts==99)
+								if($object->fk_statut<2 OR $object->fk_statut==99)
 								{
 									print '<td style="text-align:right;" class="nowrap">';
 									print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;rowid='.$objp->rowid.'#'.$objp->rowid.'">';
@@ -1689,7 +1689,7 @@ else
 					//print '</div>';
 
 					// Add a line
-					if (($object->fk_c_expensereport_statuts==0 || $object->fk_c_expensereport_statuts==99) && $action != 'editline')
+					if (($object->fk_statut==0 || $object->fk_statut==99) && $action != 'editline')
 					{
 						print_fiche_titre($langs->trans("AddLine"),'','');
 
@@ -1799,7 +1799,7 @@ if ($action != 'create' && $action != 'edit')
 	*	ET fk_user_author == user courant
 	* 	Afficher : "Enregistrer" / "Modifier" / "Supprimer"
 	*/
-	if ($user->rights->expensereport->creer && $object->fk_c_expensereport_statuts==0)
+	if ($user->rights->expensereport->creer && $object->fk_statut==0)
 	{
 		if ($object->fk_user_author == $user->id)
 		{
@@ -1825,7 +1825,7 @@ if ($action != 'create' && $action != 'edit')
 	 *	ET fk_user_author == user courant
 	 * 	Afficher : "Enregistrer" / "Modifier" / "Supprimer"
 	 */
-	if($user->rights->expensereport->creer && $object->fk_c_expensereport_statuts==99)
+	if($user->rights->expensereport->creer && $object->fk_statut==99)
 	{
 		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid)
 		{
@@ -1845,7 +1845,7 @@ if ($action != 'create' && $action != 'edit')
 		}
 	}
 
-	if ($user->rights->expensereport->to_paid && $object->fk_c_expensereport_statuts==5)
+	if ($user->rights->expensereport->to_paid && $object->fk_statut==5)
 	{
 		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid)
 		{
@@ -1859,7 +1859,7 @@ if ($action != 'create' && $action != 'edit')
 	*	ET fk_user_validator == user courant
 	*	Afficher : "Valider" / "Refuser" / "Supprimer"
 	*/
-	if ($object->fk_c_expensereport_statuts == 2)
+	if ($object->fk_statut == 2)
 	{
 		if ($object->fk_user_author == $user->id)
 		{
@@ -1868,7 +1868,7 @@ if ($action != 'create' && $action != 'edit')
 		}
 	}
 
-	if ($user->rights->expensereport->approve && $object->fk_c_expensereport_statuts == 2)
+	if ($user->rights->expensereport->approve && $object->fk_statut == 2)
 	{
 		//if($object->fk_user_validator==$user->id)
 		//{
@@ -1895,7 +1895,7 @@ if ($action != 'create' && $action != 'edit')
 	 *	ET user à droit de "to_paid"
 	*	Afficher : "Annuler" / "Payer" / "Supprimer"
 	*/
-	if ($user->rights->expensereport->to_paid && $object->fk_c_expensereport_statuts == 5)
+	if ($user->rights->expensereport->to_paid && $object->fk_statut == 5)
 	{
 		// Payer
 		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=paid&id='.$id.'">'.$langs->trans('TO_PAID').'</a>';
@@ -1918,7 +1918,7 @@ if ($action != 'create' && $action != 'edit')
 	*	ET user à droit "to_paid"
 	*	Afficher : "Annuler"
 	*/
-	if ($user->rights->expensereport->approve && $user->rights->expensereport->to_paid && $object->fk_c_expensereport_statuts==6)
+	if ($user->rights->expensereport->approve && $user->rights->expensereport->to_paid && $object->fk_statut==6)
 	{
 		// Annuler
 		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&id='.$id.'">'.$langs->trans('Cancel').'</a>';
@@ -1933,7 +1933,7 @@ if ($action != 'create' && $action != 'edit')
 	 * 	ET user à droit "supprimer"
 	 *	Afficher : "Supprimer"
 	 */
-	if ($user->rights->expensereport->supprimer && $object->fk_c_expensereport_statuts==4)
+	if ($user->rights->expensereport->supprimer && $object->fk_statut==4)
 	{
 
 		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid)
@@ -1959,7 +1959,7 @@ print '<div style="width:50%">';
 /*
  * Documents generes
  */
-if($user->rights->expensereport->export && $object->fk_c_expensereport_statuts>0 && $action != 'edit')
+if($user->rights->expensereport->export && $object->fk_statut>0 && $action != 'edit')
 {
 	$filename	=	dol_sanitizeFileName($object->ref);
 	$filedir	=	$conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref);
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index c14c7ff2be7..5d82aa1be4e 100755
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -43,7 +43,7 @@ class ExpenseReport extends CommonObject
 
 	var $fk_user_validator;
 	var $status;
-	var $fk_c_expensereport_statuts;		// -- 1=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
+	var $fk_statut;		// -- 1=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
 	var $fk_c_paiement;
 
 	var $user_author_infos;
@@ -150,7 +150,7 @@ class ExpenseReport extends CommonObject
 		$sql.= ",date_create";
 		$sql.= ",fk_user_author";
 		$sql.= ",fk_user_validator";
-		$sql.= ",fk_c_expensereport_statuts";
+		$sql.= ",fk_statut";
 		$sql.= ",fk_c_paiement";
 		$sql.= ",note_public";
 		$sql.= ",note_private";
@@ -164,7 +164,7 @@ class ExpenseReport extends CommonObject
 		$sql.= ", '".$this->db->idate($now)."'";
 		$sql.= ", ".($user->id > 0 ? $user->id:"null");
 		$sql.= ", ".($this->fk_user_validator > 0 ? $this->fk_user_validator:"null");
-		$sql.= ", ".($this->fk_c_expensereport_statuts > 1 ? $this->fk_c_expensereport_statuts:0);
+		$sql.= ", ".($this->fk_statut > 1 ? $this->fk_statut:0);
 		$sql.= ", ".($this->fk_c_paiement > 0 ? $this->fk_c_paiement:"null");
 		$sql.= ", ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null");
 		$sql.= ", ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null");
@@ -248,7 +248,7 @@ class ExpenseReport extends CommonObject
 		$sql.= " , fk_user_validator = ".($this->fk_user_validator > 0 ? $this->fk_user_validator:"null");
 		$sql.= " , fk_user_valid = ".($this->fk_user_valid > 0 ? $this->fk_user_valid:"null");
 		$sql.= " , fk_user_paid = ".($this->fk_user_paid > 0 ? $this->fk_user_paid:"null");
-		$sql.= " , fk_c_expensereport_statuts = ".($this->fk_c_expensereport_statuts >= 0 ? $this->fk_c_expensereport_statuts:'0');
+		$sql.= " , fk_statut = ".($this->fk_statut >= 0 ? $this->fk_statut:'0');
 		$sql.= " , fk_c_paiement = ".($this->fk_c_paiement > 0 ? $this->fk_c_paiement:"null");
 		$sql.= " , note_public = ".(!empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"''");
 		$sql.= " , note_private = ".(!empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"''");
@@ -284,7 +284,7 @@ class ExpenseReport extends CommonObject
 		$sql.= " d.date_refuse, d.date_cancel,";														// ACTIONS
 		$sql.= " d.total_ht, d.total_ttc, d.total_tva,"; 												// TOTAUX (int)
 		$sql.= " d.date_debut, d.date_fin, d.date_create, d.date_valid, d.date_approve, d.date_paiement,"; 			// DATES (datetime)
-		$sql.= " d.fk_user_author, d.fk_user_validator, d.fk_c_expensereport_statuts as status, d.fk_c_paiement,";
+		$sql.= " d.fk_user_author, d.fk_user_validator, d.fk_statut as status, d.fk_c_paiement,";
 		$sql.= " d.fk_user_valid, d.fk_user_approve, d.fk_user_paid,";
 		$sql.= " dp.libelle as libelle_paiement, dp.code as code_paiement";								// INNER JOIN paiement
 		$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as d LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as dp ON d.fk_c_paiement = dp.id";
@@ -335,18 +335,18 @@ class ExpenseReport extends CommonObject
 				if ($this->fk_user_validator > 0) $user_approver->fetch($this->fk_user_validator);
 				$this->user_validator_infos = dolGetFirstLastname($user_approver->firstname, $user_approver->lastname);
 
-				$this->fk_c_expensereport_statuts = $obj->status;
+				$this->fk_statut = $obj->status;
 				$this->status                     = $obj->status;
 				$this->fk_c_paiement			  = $obj->fk_c_paiement;
 
-				if ($this->fk_c_expensereport_statuts==5 || $this->fk_c_expensereport_statuts==6)
+				if ($this->fk_statut==5 || $this->fk_statut==6)
 				{
 					$user_valid = new User($this->db);
 					if ($this->fk_user_valid > 0) $user_valid->fetch($this->fk_user_valid);
 					$this->user_valid_infos = dolGetFirstLastname($user_valid->firstname, $user_valid->lastname);
 				}
 
-				if ($this->fk_c_expensereport_statuts==6)
+				if ($this->fk_statut==6)
 				{
 					$user_paid = new User($this->db);
 					if ($this->fk_user_paid > 0) $user_paid->fetch($this->fk_user_paid);
@@ -514,7 +514,7 @@ class ExpenseReport extends CommonObject
 		$this->date_approve = $now;
 
 		$this->status = 5;
-		$this->fk_c_expensereport_statuts = 5;
+		$this->fk_statut = 5;
 
 		$this->fk_user_author = $user->id;
 		$this->fk_user_valid = $user->id;
@@ -584,7 +584,7 @@ class ExpenseReport extends CommonObject
 
 					$objp = $db->fetch_object($result);
 
-					$sql2 = "SELECT d.rowid, d.fk_user_author, d.ref, d.fk_c_expensereport_statuts";
+					$sql2 = "SELECT d.rowid, d.fk_user_author, d.ref, d.fk_statut";
 					$sql2.= " FROM ".MAIN_DB_PREFIX."expensereport as d";
 					$sql2.= " WHERE d.rowid = '".$objp->fk_expensereport."'";
 
@@ -593,7 +593,7 @@ class ExpenseReport extends CommonObject
 
 					$objp->fk_user_author = $obj->fk_user_author;
 					$objp->ref = $obj->ref;
-					$objp->fk_c_expensereport_status = $obj->fk_c_expensereport_statuts;
+					$objp->fk_c_expensereport_status = $obj->fk_statut;
 					$objp->rowid = $obj->rowid;
 
 					$total_HT = $total_HT + $objp->total_ht;
@@ -848,10 +848,10 @@ class ExpenseReport extends CommonObject
 			$this->ref = strtoupper($user->login).$expld_car.$prefix.$this->ref.$expld_car.dol_print_date($this->date_debut,'%y%m%d');
 		}
 
-		if ($this->fk_c_expensereport_statuts != 2)
+		if ($this->fk_statut != 2)
 		{
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql.= " SET ref = '".$this->ref."', fk_c_expensereport_statuts = 2, fk_user_valid = ".$user->id.",";
+			$sql.= " SET ref = '".$this->ref."', fk_statut = 2, fk_user_valid = ".$user->id.",";
 			$sql.= " ref_number_int = ".$ref_number_int;
 			$sql.= ' WHERE rowid = '.$this->id;
 
@@ -894,10 +894,10 @@ class ExpenseReport extends CommonObject
 
 		$this->date_debut = $this->db->jdate($objp->date_debut);
 
-		if ($this->fk_c_expensereport_statuts != 2)
+		if ($this->fk_statut != 2)
 		{
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql.= " SET fk_c_expensereport_statuts = 2";
+			$sql.= " SET fk_statut = 2";
 			$sql.= ' WHERE rowid = '.$this->id;
 
 			dol_syslog(get_class($this)."::set_save_from_refuse sql=".$sql, LOG_DEBUG);
@@ -930,10 +930,10 @@ class ExpenseReport extends CommonObject
 
 		// date approval
 		$this->date_approve = $this->db->idate($now);
-		if ($this->fk_c_expensereport_statuts != 5)
+		if ($this->fk_statut != 5)
 		{
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql.= " SET ref = '".$this->ref."', fk_c_expensereport_statuts = 5, fk_user_approve = ".$user->id.",";
+			$sql.= " SET ref = '".$this->ref."', fk_statut = 5, fk_user_approve = ".$user->id.",";
 			$sql.= " date_approve='".$this->date_approve."'";
 			$sql.= ' WHERE rowid = '.$this->id;
 			if ($this->db->query($sql))
@@ -963,17 +963,17 @@ class ExpenseReport extends CommonObject
 		$now = dol_now();
 
 		// date de refus
-		if ($this->fk_c_expensereport_statuts != 99)
+		if ($this->fk_statut != 99)
 		{
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql.= " SET ref = '".$this->ref."', fk_c_expensereport_statuts = 99, fk_user_refuse = ".$user->id.",";
+			$sql.= " SET ref = '".$this->ref."', fk_statut = 99, fk_user_refuse = ".$user->id.",";
 			$sql.= " date_refuse='".$this->db->idate($now)."',";
 			$sql.= " detail_refuse='".$this->db->escape($details)."'";
 			$sql.= " fk_user_approve=NULL,";
 			$sql.= ' WHERE rowid = '.$this->id;
 			if ($this->db->query($sql))
 			{
-				$this->fk_c_expensereport_statuts = 99;
+				$this->fk_statut = 99;
 				$this->fk_user_refuse = $user->id;
 				$this->detail_refuse = $details;
 				$this->date_refuse = $now;
@@ -1002,10 +1002,10 @@ class ExpenseReport extends CommonObject
 		$now= dol_now();
 
 		$this->date_paiement = $this->db->idate($now);
-		if ($this->fk_c_expensereport_statuts != 6)
+		if ($this->fk_statut != 6)
 		{
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql.= " SET fk_c_expensereport_statuts = 6, fk_user_paid = ".$user->id.",";
+			$sql.= " SET fk_statut = 6, fk_user_paid = ".$user->id.",";
 			$sql.= " date_paiement='".$this->db->idate($this->date_paiement)."'";
 			$sql.= ' WHERE rowid = '.$this->id;
 
@@ -1037,7 +1037,7 @@ class ExpenseReport extends CommonObject
 		if ($this->fk_c_deplacement_statuts != 5)
 		{
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql.= " SET fk_c_expensereport_statuts = 5";
+			$sql.= " SET fk_statut = 5";
 			$sql.= ' WHERE rowid = '.$this->id;
 
 			dol_syslog(get_class($this)."::set_unpaid sql=".$sql, LOG_DEBUG);
@@ -1065,10 +1065,10 @@ class ExpenseReport extends CommonObject
 	function set_cancel($user,$detail)
 	{
 		$this->date_cancel = $this->db->idate(gmmktime());
-		if ($this->fk_c_expensereport_statuts != 4)
+		if ($this->fk_statut != 4)
 		{
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-			$sql.= " SET fk_c_expensereport_statuts = 4, fk_user_cancel = ".$user->id;
+			$sql.= " SET fk_statut = 4, fk_user_cancel = ".$user->id;
 			$sql.= ", date_cancel='".$this->date_cancel."'";
 			$sql.= " ,detail_cancel='".$this->db->escape($detail)."'";
 			$sql.= ' WHERE rowid = '.$this->id;
@@ -1197,7 +1197,7 @@ class ExpenseReport extends CommonObject
 
 	function updateline($rowid, $type_fees_id, $projet_id, $c_tva, $comments, $qty, $value_unit, $date, $expensereport_id)
 	{
-		if ($this->fk_c_expensereport_statuts==0 || $this->fk_c_expensereport_statuts==99)
+		if ($this->fk_statut==0 || $this->fk_statut==99)
 		{
 			$this->db->begin();
 
@@ -1693,7 +1693,7 @@ class ExpenseReportLine
  *    @param	int		$useempty		1=Add empty line
  *    @return	string					HTML select with sattus
  */
-function select_expensereport_statut($selected='',$htmlname='fk_c_expensereport_statuts',$useempty=1)
+function select_expensereport_statut($selected='',$htmlname='fk_statut',$useempty=1)
 {
 	global $db;
 
diff --git a/htdocs/expensereport/class/expensereportstats.class.php b/htdocs/expensereport/class/expensereportstats.class.php
index 5d71be15738..140e492972e 100644
--- a/htdocs/expensereport/class/expensereportstats.class.php
+++ b/htdocs/expensereport/class/expensereportstats.class.php
@@ -59,7 +59,7 @@ class ExpenseReportStats extends Stats
 		$this->from = MAIN_DB_PREFIX.$object->table_element;
 		$this->field='total_ht';
 
-		$this->where = " fk_c_expensereport_statuts > 0 and date_valid > '2000-01-01'";
+		$this->where = " fk_statut > 0 and date_valid > '2000-01-01'";
 		//$this->where.= " AND entity = ".$conf->entity;
 		if ($this->socid)
 		{
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index ec9ccba2c0b..62f5cbe89fc 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -142,7 +142,7 @@ $max=10;
 
 $langs->load("boxes");
 
-$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, d.rowid, d.date_debut as dated, d.date_fin as datef, d.date_create as dm, d.total_ht, d.total_ttc, d.fk_c_expensereport_statuts as fk_status";
+$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, d.rowid, d.date_debut as dated, d.date_fin as datef, d.date_create as dm, d.total_ht, d.total_ttc, d.fk_statut as fk_status";
 $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d, ".MAIN_DB_PREFIX."user as u";
 if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql.= " WHERE u.rowid = d.fk_user_author";
@@ -186,8 +186,8 @@ if ($result)
             print '<tr '.$bc[$var].'>';
             print '<td>'.$expensereportstatic->getNomUrl(1).'</td>';
             print '<td>'.$userstatic->getNomUrl(1).'</td>';
-            print '<td align="right">'.$obj->total_ht.'</td>';
-            print '<td align="right">'.$obj->total_ttc.'</td>';
+            print '<td align="right">'.price($obj->total_ht).'</td>';
+            print '<td align="right">'.price($obj->total_ttc).'</td>';
             print '<td align="right">'.dol_print_date($db->jdate($obj->dm),'day').'</td>';
             print '<td align="right">';
             //print $obj->libelle;
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 44f1426fd36..f48a0111a46 100755
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -85,7 +85,7 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-$sql = "SELECT d.rowid, d.ref, d.total_ht, d.total_tva, d.total_ttc, d.fk_c_expensereport_statuts as status,";
+$sql = "SELECT d.rowid, d.ref, d.total_ht, d.total_tva, d.total_ttc, d.fk_statut as status,";
 $sql.= " d.date_debut, d.date_fin,";
 $sql.= " u.rowid as id_user, u.firstname, u.lastname";
 $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d";
@@ -157,7 +157,7 @@ if ($month_start > 0) {
 	}
 }
 if (!empty($search_user) && $search_user > 0) $sql.= " AND d.fk_user_author = '".$search_user."'";
-if($search_state != '') $sql.= " AND d.fk_c_expensereport_statuts = '$search_state'\n";
+if($search_state != '') $sql.= " AND d.fk_statut = '$search_state'\n";
 
 // RESTRICT RIGHTS
 if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous))
diff --git a/htdocs/expensereport/synchro_compta.php b/htdocs/expensereport/synchro_compta.php
index ec2703d059a..58fcbaee301 100755
--- a/htdocs/expensereport/synchro_compta.php
+++ b/htdocs/expensereport/synchro_compta.php
@@ -136,11 +136,11 @@ else:
 	print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("ViewAccountSynch").'">';
 	print "</form>";
 
-	$sql = "SELECT d.fk_bank_account, d.ref, d.rowid, d.date_valid, d.fk_user_author, d.total_ttc, d.integration_compta, d.fk_c_expensereport_statuts";
+	$sql = "SELECT d.fk_bank_account, d.ref, d.rowid, d.date_valid, d.fk_user_author, d.total_ttc, d.integration_compta, d.fk_statut";
 	$sql.= " ,CONCAT(u.firstname,' ',u.lastname) as declarant_NDF";
 	$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d";
 	$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON d.fk_user_author = u.rowid";
-	$sql.= " WHERE d.fk_c_expensereport_statuts = 6";
+	$sql.= " WHERE d.fk_statut = 6";
 	$sql.= " ORDER BY d.date_valid DESC";
 
 	$resql=$db->query($sql);
diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index 2a36ef78737..aa0b0571bbb 100755
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -157,7 +157,7 @@ CREATE TABLE llx_expensereport (
   fk_user_refuse 	integer DEFAULT NULL,
   fk_user_cancel 	integer DEFAULT NULL,
   fk_user_paid 		integer DEFAULT NULL,
-  fk_c_expensereport_statuts integer NOT NULL,		-- 1=brouillon, 2=validé (attente approb), 4=annulé, 5=approuvé, 6=payed, 99=refusé
+  fk_statut			integer NOT NULL,		-- 1=brouillon, 2=validé (attente approb), 4=annulé, 5=approuvé, 6=payed, 99=refusé
   fk_c_paiement 	integer DEFAULT NULL,
   note_public		text,
   note_private 		text,
diff --git a/htdocs/install/mysql/tables/llx_expensereport.sql b/htdocs/install/mysql/tables/llx_expensereport.sql
index e60be7251a5..657d8f9e278 100755
--- a/htdocs/install/mysql/tables/llx_expensereport.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport.sql
@@ -44,7 +44,7 @@ CREATE TABLE llx_expensereport (
   fk_user_refuse 	integer DEFAULT NULL,
   fk_user_cancel 	integer DEFAULT NULL,
   fk_user_paid 		integer DEFAULT NULL,
-  fk_c_expensereport_statuts integer NOT NULL,		-- 1=brouillon, 2=validé (attente approb), 4=annulé, 5=approuvé, 6=payed, 99=refusé
+  fk_statut			integer NOT NULL,		-- 1=brouillon, 2=validé (attente approb), 4=annulé, 5=approuvé, 6=payed, 99=refusé
   fk_c_paiement 	integer DEFAULT NULL,
   note_public		text,
   note_private 		text,

From 69dc3cdd6153cd6ccccdc5419c28af79096a9cd5 Mon Sep 17 00:00:00 2001
From: aspangaro <alexandre.spangaro@gmail.com>
Date: Sun, 8 Mar 2015 08:21:49 +0100
Subject: [PATCH 36/93] Correct fk_statut & work en list

---
 htdocs/core/class/commonobject.class.php      |   2 +-
 .../doc/pdf_standard.modules.php              |   8 +-
 .../core/modules/modExpenseReport.class.php   |   2 +-
 htdocs/expensereport/card.php                 |  10 +-
 .../class/expensereport.class.php             |   2 +-
 htdocs/expensereport/list.php                 | 128 ++++++------------
 6 files changed, 57 insertions(+), 95 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 02ccd13b97c..114648fdf14 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2140,7 +2140,7 @@ abstract class CommonObject
 
         $fieldstatus="fk_statut";
         if ($elementTable == 'user') $fieldstatus="statut";
-        if ($elementTable == 'expensereport') $fieldstatus="fk_c_expensereport_statuts";
+        if ($elementTable == 'expensereport') $fieldstatus="fk_statut";
 		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus="status";
         
         $sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index bdb19778c87..d2cdb71e429 100755
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -508,7 +508,7 @@ class pdf_standard extends ModeleExpenseReport
 		*/
 
 	    // Filligrane brouillon
-		if ($object->fk_c_expensereport_statuts==1 && ! empty($conf->global->EXPENSEREPORT_FREE_TEXT))
+		if ($object->fk_statut==1 && ! empty($conf->global->EXPENSEREPORT_FREE_TEXT))
 		{
  			pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->EXPENSEREPORT_FREE_TEXT);
 		}
@@ -640,7 +640,7 @@ class pdf_standard extends ModeleExpenseReport
 	   		$pdf->MultiCell(96,4,$outputlangs->transnoentities("DateCreation")." : ".dol_print_date($object->date_create,"day",false,$outpulangs),0,'L');
    		}
 
-   		if ($object->fk_c_expensereport_statuts==99)
+   		if ($object->fk_statut==99)
    		{
    			if ($object->fk_user_refuse > 0)
    			{
@@ -656,7 +656,7 @@ class pdf_standard extends ModeleExpenseReport
 	   			$pdf->MultiCell(96,4,$outputlangs->transnoentities("DATE_REFUS")." : ".dol_print_date($object->date_refuse,"day",false,$outpulangs),0,'L');
    			}
    		}
-   		else if($object->fk_c_expensereport_statuts==4)
+   		else if($object->fk_statut==4)
    		{
    			if ($object->fk_user_cancel > 0)
    			{
@@ -686,7 +686,7 @@ class pdf_standard extends ModeleExpenseReport
    			}
    		}
 
-   		if($object->fk_c_expensereport_statuts==6)
+   		if($object->fk_statut==6)
    		{
    			if ($object->fk_user_paid > 0)
    			{
diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index cf106fa4588..53289c512ff 100755
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -270,7 +270,7 @@ class modExpenseReport extends DolibarrModules
 									'titre'=>'ListToApprove',
 									'mainmenu'=>'hrm',
 									'leftmenu'=>'expensereport_detaillist_approve',
-									'url'=>'/expensereport/list.php?search_state=2',
+									'url'=>'/expensereport/list.php?search_status=2',
 									'langs'=>'trips',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 									'position'=>100,
 									'enabled'=>'$conf->expensereport->enabled',			// Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled.
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 02d899def0a..c71705628b6 100755
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1712,17 +1712,17 @@ else
 
 						print '<tr>';
 
-						// Sélection date
+						// Select date
 						print '<td style="text-align:center;">';
 						$form->select_date($date?$date:-1,'date');
 						print '</td>';
 
-						// Sélection projet
+						// Select project
 						print '<td>';
 						$formproject->select_projects(-1, GETPOST('fk_projet'), 'fk_projet', 0, 0, 1, 1);
 						print '</td>';
 
-						// Sélection type
+						// Select type
 						print '<td>';
 						select_type_fees_id(GETPOST('fk_c_type_fees'),'fk_c_type_fees',1);
 						print '</td>';
@@ -1732,7 +1732,7 @@ else
 						print '<textarea class="flat_ndf centpercent" name="comments">'.GETPOST('comments').'</textarea>';
 						print '</td>';
 
-						// Sélection TVA
+						// Select VAT
 						print '<td style="text-align:right;">';
 						$defaultvat=-1;
 						if (! empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
@@ -1747,7 +1747,7 @@ else
 						print '<input type="text" size="6" name="value_unit" value="'.GETPOST('value_unit').'">';
 						print '</td>';
 
-						// Quantité
+						// Quantity
 						print '<td style="text-align:right;">';
 						print '<input type="text" size="4" name="qty"  value="'.GETPOST('qty').'">';
 						print '</td>';
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 5d82aa1be4e..864c169c11c 100755
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -335,7 +335,7 @@ class ExpenseReport extends CommonObject
 				if ($this->fk_user_validator > 0) $user_approver->fetch($this->fk_user_validator);
 				$this->user_validator_infos = dolGetFirstLastname($user_approver->firstname, $user_approver->lastname);
 
-				$this->fk_statut = $obj->status;
+				$this->fk_statut 		= $obj->status;
 				$this->status                     = $obj->status;
 				$this->fk_c_paiement			  = $obj->fk_c_paiement;
 
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index f48a0111a46..6d82b86e4af 100755
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -21,12 +21,13 @@
 
 /**
  *	    \file       htdocs/expensereport/index.php
- *		\brief      Page liste des expensereports
+ *		\brief      list of expense reports
  */
 
 require "../main.inc.php";
 require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
 
 $langs->load("companies");
 $langs->load("users");
@@ -39,7 +40,7 @@ $result = restrictedArea($user, 'expensereport','','');
 
 $search_ref   = GETPOST('search_ref');
 $search_user  = GETPOST('search_user','int');
-$search_state = GETPOST('search_state','int');
+$search_status = GETPOST('search_status','int');
 $month_start  = GETPOST("month_start","int");
 $year_start   = GETPOST("year_start","int");
 $month_end    = GETPOST("month_end","int");
@@ -49,7 +50,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter"))		// Both
 {
 	$search_ref="";
 	$search_user="";
-	$search_state="";
+	$search_status="";
 	$month_start="";
 	$year_start="";
 	$month_end="";
@@ -69,13 +70,12 @@ llxHeader('', $langs->trans("ListOfTrips"));
 $max_year = 5;
 $min_year = 5;
 
-$sortorder     = $_GET["sortorder"];
-$sortfield     = $_GET["sortfield"];
-$page          = $_GET["page"];
+$sortorder     = GETPOST("sortorder");
+$sortfield     = GETPOST("sortfield");
+$page          = GETPOST("page");
 if (!$sortorder) $sortorder="DESC";
 if (!$sortfield) $sortfield="d.date_debut";
 
-
 if ($page == -1) {
 	$page = 0 ;
 }
@@ -91,73 +91,47 @@ $sql.= " u.rowid as id_user, u.firstname, u.lastname";
 $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d";
 $sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON d.fk_user_author = u.rowid";
 
-
-
-// WHERE
+// Where
 if(!empty($search_ref)){
 	$sql.= " WHERE d.ref LIKE '%".$db->escape($search_ref)."%'";
 }else{
 	$sql.= " WHERE 1 = 1";
 }
-// DATE START
-if ($month_start > 0) {
-	if ($year_start > 0) {
-		if($month_end > 0) {
-			if($year_end > 0) {
-				$sql.= " AND date_format(d.date_debut, '%Y-%m') >= '$year_start-$month_start'";
-				$sql.= " AND date_format(d.date_fin, '%Y-%m') <= '$year_end-$month_end'";
-			} else {
-				$sql.= " AND date_format(d.date_debut, '%Y-%m') >= '$year_start-$month_start'";
-				$sql.= " AND date_format(d.date_fin, '%m') <= '$month_end'";
-			}
-		} else {
-			if($year_end > 0) {
-				$sql.= " AND date_format(d.date_debut, '%Y-%m') >= '$year_start-$month_start'";
-				$sql.= " AND date_format(d.date_fin, '%Y') <= '$year_end'";
-			} else {
-				$sql.= " AND date_format(d.date_debut, '%Y-%m') >= '$year_start-$month_start'";
-			}
-		}
-	} else {
-		$sql.= " AND date_format(d.date_debut, '%m') >= '$month_start'";
-	}
-} else {
-	if ($year_start > 0) {
-		if($month_end > 0) {
-			if($year_end > 0) {
-				$sql.= " AND date_format(d.date_debut, '%Y') >= '$year_start'";
-				$sql.= " AND date_format(d.date_fin, '%Y-%m') <= '$year_end-$month_end'";
-			} else {
-				$sql.= " AND date_format(d.date_debut, '%Y') >= '$year_start'";
-				$sql.= " AND date_format(d.date_fin, '%m') <= '$month_end'";
-			}
-		} else {
-			if($year_end > 0) {
-				$sql.= " AND date_format(d.date_debut, '%Y') >= '$year_start'";
-				$sql.= " AND date_format(d.date_fin, '%Y') <= '$year_end'";
-			} else {
-				$sql.= " AND date_format(d.date_debut, '%Y') >= '$year_start'";
-			}
-		}
-	} else {
-		if($month_end > 0) {
-			if($year_end > 0) {
-				$sql.= " AND date_format(d.date_debut, '%Y') >= '$year_start'";
-				$sql.= " AND date_format(d.date_fin, '%Y-%m') <= '$year_end-$month_end'";
-			} else {
-				$sql.= " AND date_format(d.date_debut, '%Y') >= '$year_start'";
-				$sql.= " AND date_format(d.date_fin, '%m') <= '$month_end'";
-			}
-		} else {
-			if($year_end > 0) {
-				$sql.= " AND date_format(d.date_debut, '%Y') >= '$year_start'";
-				$sql.= " AND date_format(d.date_fin, '%Y') <= '$year_end'";
-			}
-		}
-	}
+// Date Start
+if ($month_start > 0)
+{
+    if ($year_start > 0 && empty($day))
+    $sql.= " AND d.date_debut BETWEEN '".$db->idate(dol_get_first_day($year_start,$month_start,false))."' AND '".$db->idate(dol_get_last_day($year_start,$month_start,false))."'";
+    else if ($year_start > 0 && ! empty($day))
+    $sql.= " AND d.date_debut BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_start, $day, $year_start))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month_start, $day, $year_start))."'";
+    else
+    $sql.= " AND date_format(d.date_debut, '%m') = '".$month_start."'";
 }
-if (!empty($search_user) && $search_user > 0) $sql.= " AND d.fk_user_author = '".$search_user."'";
-if($search_state != '') $sql.= " AND d.fk_statut = '$search_state'\n";
+else if ($year_start > 0)
+{
+	$sql.= " AND d.date_debut BETWEEN '".$db->idate(dol_get_first_day($year_start,1,false))."' AND '".$db->idate(dol_get_last_day($year_start,12,false))."'";
+}
+// Date Start
+if ($month_end > 0)
+{
+    if ($year_end > 0 && empty($day))
+    $sql.= " AND d.date_fin BETWEEN '".$db->idate(dol_get_first_day($year_end,$month_end,false))."' AND '".$db->idate(dol_get_last_day($year_end,$month_end,false))."'";
+    else if ($year_end > 0 && ! empty($day))
+    $sql.= " AND d.date_fin BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_end, $day, $year_end))."' AND '".$db->idate(dol_mktime(23, 59, 59, $month_end, $day, $year_end))."'";
+    else
+    $sql.= " AND date_format(d.date_fin, '%m') = '".$month_end."'";
+}
+else if ($year_end > 0)
+{
+	$sql.= " AND d.date_fin BETWEEN '".$db->idate(dol_get_first_day($year_end,1,false))."' AND '".$db->idate(dol_get_last_day($year_end,12,false))."'";
+}
+// User
+if ($search_name)
+{
+    $sql .= natural_search('u.lastname', $search_name);
+}
+// Status
+if($search_status != '') $sql.= " AND d.fk_statut = '".$search_status."'";
 
 // RESTRICT RIGHTS
 if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous))
@@ -219,17 +193,13 @@ if ($resql)
 		print '<td class="liste_titre">&nbsp;</td>';
 	}
 
-
 	print '<td class="liste_titre">&nbsp;</td>';
-
 	print '<td class="liste_titre">&nbsp;</td>';
-
-	print '<td class="liste_titre" align="right">';
-	print "</td>";
+	print '<td class="liste_titre">&nbsp;</td>';
 
 	// Status
 	print '<td class="liste_titre" align="right">';
-	select_expensereport_statut($search_state,'search_state');
+	select_expensereport_statut($search_status,'search_status');
 	print '</td>';
 
 	print '<td class="liste_titre" align="right">';
@@ -257,10 +227,6 @@ if ($resql)
 			print '<td align="center">'.($objp->date_debut > 0 ? dol_print_date($objp->date_debut, 'day') : '').'</td>';
 			print '<td align="center">'.($objp->date_fin > 0 ? dol_print_date($objp->date_fin, 'day') : '').'</td>';
 			print '<td align="left"><a href="'.DOL_URL_ROOT.'/user/card.php?id='.$objp->id_user.'">'.img_object($langs->trans("ShowUser"),"user").' '.dolGetFirstLastname($objp->firstname, $objp->lastname).'</a></td>';
-			/*print '<td align="right">'.price($objp->total_tva, '', $langs, 0, 'MT', 0, $conf->currency).'</td>';
-			print '<td align="right">'.price($objp->total_ht, '', $langs, 0, 'MT', 0, $conf->currency).'</td>';
-			print '<td align="right">'.price($objp->total_ttc, '', $langs, 0, 'MT', 0, $conf->currency).'</td>';
-			*/
 			print '<td align="right">'.price($objp->total_ht).'</td>';
 			print '<td align="right">'.price($objp->total_tva).'</td>';
 			print '<td align="right">'.price($objp->total_ttc).'</td>';
@@ -281,11 +247,7 @@ if ($resql)
 
 		print '<tr class="liste_total">';
 		print '<td colspan="4">'.$langs->trans("Total").'</td>';
-		/*
-		print '<td style="text-align:right;">'.price($total_total_tva, '', $langs, 0, 'MT', 0, $conf->currency).'</td>';
-		print '<td style="text-align:right;">'.price($total_total_ht, '', $langs, 0, 'MT', 0, $conf->currency).'</td>';
-		print '<td style="text-align:right;">'.price($total_total_ttc, '', $langs, 0, 'MT', 0, $conf->currency).'</td>';
-		*/
+
 		print '<td style="text-align:right;">'.$total_total_ht.'</td>';
 		print '<td style="text-align:right;">'.$total_total_tva.'</td>';
 		print '<td style="text-align:right;">'.$total_total_ttc.'</td>';

From e6984bae9d260e33b856d05106420623340d11a8 Mon Sep 17 00:00:00 2001
From: delcroix Patrick <delcroip@gmail.com>
Date: Sun, 8 Mar 2015 12:37:07 +0100
Subject: [PATCH 37/93] FIX: jdate returning -62169955200 on x64 machine

on x64 machine jdate return -62169955200 instead of 0 when the input is 00-00-00 00:00:00 or equivalent
same issue for mktime https://bugs.php.net/bug.php?id=53662
---
 htdocs/core/db/DoliDB.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 67e3022d6e3..c689e49b85e 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -274,6 +274,8 @@ abstract class DoliDB implements Database
 	 */
 	function jdate($string, $gm=false)
 	{
+		if($string==0 || $string=="0000-00-00 00:00:00")
+			return NULL;
 		$string=preg_replace('/([^0-9])/i','',$string);
 		$tmp=$string.'000000';
 		$date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);

From 9d320e4268132df3a3accadf196524699f649b3a Mon Sep 17 00:00:00 2001
From: "Estephe L." <github@estephe.me>
Date: Sun, 8 Mar 2015 23:29:09 +0100
Subject: [PATCH 38/93] Fix Anchor link for quick access when editing.

This is a quick fix to make anchor link works well when editing a proposal, order or invoice ...
---
 htdocs/core/tpl/objectline_view.tpl.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index 948a61bae2c..c31d8da9277 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -27,7 +27,7 @@
 	<?php if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
 	<td align="center"><?php $coldisplay++; ?><?php echo ($i+1); ?></td>
 	<?php } ?>
-	<td><?php $coldisplay++; ?><div id="<?php echo $line->rowid; ?>"></div>
+	<td><?php $coldisplay++; ?><div id="line_<?php echo $line->rowid; ?>"></div>
 	<?php if (($line->info_bits & 2) == 2) { ?>
 		<a href="<?php echo DOL_URL_ROOT.'/comm/remx.php?id='.$this->socid; ?>">
 		<?php
@@ -142,7 +142,7 @@
 	<td align="center"><?php $coldisplay++; ?>
 		<?php if (($line->info_bits & 2) == 2) { ?>
 		<?php } else { ?>
-		<a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=editline&amp;lineid='.$line->id.'#'.$line->id; ?>">
+		<a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=editline&amp;lineid='.$line->id.'#line_'.$line->id; ?>">
 		<?php echo img_edit(); ?>
 		</a>
 		<?php } ?>

From f8dfa618595106bdc7b3a0bb0b185ee99735896b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Mon, 9 Mar 2015 16:20:51 +0100
Subject: [PATCH 39/93] FIXED #1901: Inverted supplier order/invoice buttons in
 project referring objects

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

diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index f0e5efa7254..5a499007fae 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -360,11 +360,11 @@ foreach ($listofreferent as $key => $value)
 			{
 				if ($key == 'order_supplier' && ! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->creer)
 				{
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?socid='.$project->societe->id.'&amp;action=create&amp;origin='.$project->element.'&amp;originid='.$project->id.'">'.$langs->trans("AddSupplierInvoice").'</a>';
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/fiche.php?socid='.$project->societe->id.'&amp;action=create&amp;origin='.$project->element.'&amp;originid='.$project->id.'">'.$langs->trans("AddSupplierOrder").'</a>';
 				}
 				if ($key == 'invoice_supplier' && ! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->creer)
 				{
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/fiche.php?socid='.$project->societe->id.'&amp;action=create&amp;origin='.$project->element.'&amp;originid='.$project->id.'">'.$langs->trans("AddSupplierOrder").'</a>';
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/fiche.php?socid='.$project->societe->id.'&amp;action=create&amp;origin='.$project->element.'&amp;originid='.$project->id.'">'.$langs->trans("AddSupplierInvoice").'</a>';
 				}
 			}
 		}

From bd6f13e6ed2349c701dccc2c983509fa493c7119 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Mar 2015 19:13:19 +0100
Subject: [PATCH 40/93] Can export extra fields of lines.

---
 .../modules/modAskPriceSupplier.class.php     |  1 -
 htdocs/core/modules/modFournisseur.class.php  | 92 ++++++++++++++++---
 2 files changed, 81 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/modules/modAskPriceSupplier.class.php b/htdocs/core/modules/modAskPriceSupplier.class.php
index f64126e224e..d415d615756 100644
--- a/htdocs/core/modules/modAskPriceSupplier.class.php
+++ b/htdocs/core/modules/modAskPriceSupplier.class.php
@@ -110,7 +110,6 @@ class modAskPriceSupplier extends DolibarrModules
 		$this->rights[$r][3] = 1; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'creer';
 
-
 		$r++;
 		$this->rights[$r][0] = $this->numero + $r; // id de la permission
 		$this->rights[$r][1] = 'Validate supplier proposals'; // libelle de la permission
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 45cb61b04fd..9e26b0e8b81 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2012      Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2013	   Philippe Grand	    <philippe.grand@atoo-net.com>
@@ -251,11 +251,11 @@ class modFournisseur extends DolibarrModules
             $this->export_icon[$r]='bill';
             $this->export_permission[$r]=array(array("fournisseur","facture","export"));
             $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.ref_supplier'=>"RefSupplier",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total_ht'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.total_tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_public'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.remise_percent'=>"Discount",'fd.total_ht'=>"LineTotalHT",'fd.total_ttc'=>"LineTotalTTC",'fd.tva'=>"LineTotalVAT",'fd.product_type'=>'TypeOfLineServiceOrProduct','fd.fk_product'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel','p.accountancy_code_buy'=>'ProductAccountancyBuyCode');
-            //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:CompanyName",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Text",'fd.qty'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.tva'=>"Number",'fd.product_type'=>'Boolean','fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text');
-            $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Text",'fd.qty'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.tva'=>"Number",'fd.product_type'=>'Boolean','fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text');
+            //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:CompanyName",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Text",'fd.qty'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.tva'=>"Number",'fd.product_type'=>'Number','fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text');
+            $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Text",'fd.qty'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.tva'=>"Number",'fd.product_type'=>'Number','fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text');
             $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.ref'=>"invoice",'f.ref_supplier'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total_ht'=>"invoice",'f.total_ttc'=>"invoice",'f.total_tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note_public'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.remise_percent'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva'=>"invoice_line",'fd.product_type'=>'invoice_line','fd.fk_product'=>'product','p.ref'=>'product','p.label'=>'product','p.accountancy_code_buy'=>'product');
             $this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-			// Add extra fields
+			// Add extra fields object
 			$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn'";
 			$resql=$this->db->query($sql);
 			if ($resql)    // This can fail when class is used on old database (during migration for example)
@@ -288,13 +288,48 @@ class modFournisseur extends DolibarrModules
 					$this->export_entities_array[$r][$fieldname]='invoice';
 				}
 			}
-			// End add axtra fields
-            $this->export_sql_start[$r]='SELECT DISTINCT ';
+			// End add extra fields
+			// Add extra fields line
+			$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn_det'";
+			$resql=$this->db->query($sql);
+			if ($resql)    // This can fail when class is used on old database (during migration for example)
+			{
+				while ($obj=$this->db->fetch_object($resql))
+				{
+					$fieldname='extraline.'.$obj->name;
+					$fieldlabel=ucfirst($obj->label);
+					$typeFilter="Text";
+					switch($obj->type)
+					{
+						case 'int':
+						case 'double':
+						case 'price':
+							$typeFilter="Numeric";
+							break;
+						case 'date':
+						case 'datetime':
+							$typeFilter="Date";
+							break;
+						case 'boolean':
+							$typeFilter="Boolean";
+							break;
+						case 'sellist':
+							$typeFilter="List:".$obj->param;
+							break;
+					}
+					$this->export_fields_array[$r][$fieldname]=$fieldlabel;
+					$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
+					$this->export_entities_array[$r][$fieldname]='invoice_line';
+				}
+			}
+			// End add extra fields line
+			$this->export_sql_start[$r]='SELECT DISTINCT ';
             $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
             $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
             $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture_fourn as f';
             $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_extrafields as extra ON f.rowid = extra.fk_object';
             $this->export_sql_end[$r] .=' , '.MAIN_DB_PREFIX.'facture_fourn_det as fd';
+            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_det_extrafields as extraline ON fd.rowid = extraline.fk_object';
             $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
             $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture_fourn';
             $this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('supplier_invoice',1).')';
@@ -309,7 +344,7 @@ class modFournisseur extends DolibarrModules
             $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'pf.amount'=>'Number','p.datep'=>'Date','p.num_paiement'=>'Number');
             $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.ref'=>"invoice",'f.ref_supplier'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total_ht'=>"invoice",'f.total_ttc'=>"invoice",'f.total_tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note_public'=>"invoice",'p.rowid'=>'payment','pf.amount'=>'payment','p.datep'=>'payment','p.num_paiement'=>'payment');
             $this->export_dependencies_array[$r]=array('payment'=>'p.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-			// Add extra fields
+			// Add extra fields object
 			$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn'";
 			$resql=$this->db->query($sql);
 			if ($resql)    // This can fail when class is used on old database (during migration for example)
@@ -342,7 +377,7 @@ class modFournisseur extends DolibarrModules
 					$this->export_entities_array[$r][$fieldname]='invoice';
 				}
 			}
-			// End add axtra fields
+			// End add extra fields object
             $this->export_sql_start[$r]='SELECT DISTINCT ';
             $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
             $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
@@ -361,10 +396,10 @@ class modFournisseur extends DolibarrModules
             $this->export_icon[$r]='order';
             $this->export_permission[$r]=array(array("fournisseur","commande","export"));
             $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','s.tva_intra'=>'VATIntra','f.rowid'=>"OrderId",'f.ref'=>"Ref",'f.ref_supplier'=>"RefSupplier",'f.date_creation'=>"DateCreation",'f.date_commande'=>"OrderDate",'f.total_ht'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.fk_statut'=>'Status','f.note_public'=>"NotePublic",'f.note_private'=>"NotePrivate",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.remise_percent'=>"Discount",'fd.total_ht'=>"LineTotalHT",'fd.total_ttc'=>"LineTotalTTC",'fd.total_tva'=>"LineTotalVAT",'fd.product_type'=>'TypeOfLineServiceOrProduct','fd.fk_product'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
-            $this->export_TypeFields_array[$r]=array('s.rowid'=>"company",'s.nom'=>'Text','s.address'=>'Text','s.cp'=>'Text','s.ville'=>'Text','c.code'=>'Text','s.tel'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.idprof5'=>'Text','s.idprof6'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.date_creation'=>"Date",'f.date_commande'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.tva'=>"Number",'f.fk_statut'=>'Status','f.note_public'=>"Text",'f.note_private'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Number",'fd.qty'=>"Number",'fd.remise_percent'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.total_tva'=>"Number",'fd.product_type'=>'Boolean','fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text');
+            $this->export_TypeFields_array[$r]=array('s.rowid'=>"company",'s.nom'=>'Text','s.address'=>'Text','s.cp'=>'Text','s.ville'=>'Text','c.code'=>'Text','s.tel'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.idprof5'=>'Text','s.idprof6'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.date_creation'=>"Date",'f.date_commande'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.tva'=>"Number",'f.fk_statut'=>'Status','f.note_public'=>"Text",'f.note_private'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Number",'fd.qty'=>"Number",'fd.remise_percent'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.total_tva'=>"Number",'fd.product_type'=>'Number','fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text');
             $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','s.tva_intra'=>'company','f.rowid'=>"order",'f.ref'=>"order",'f.ref_supplier'=>"order",'f.date_creation'=>"order",'f.date_commande'=>"order",'f.total_ht'=>"order",'f.total_ttc'=>"order",'f.tva'=>"order",'f.fk_statut'=>'order','f.note_public'=>"order",'f.note_private'=>"order",'fd.rowid'=>'order_line','fd.description'=>"order_line",'fd.tva_tx'=>"order_line",'fd.qty'=>"order_line",'fd.remise_percent'=>"order_line",'fd.total_ht'=>"order_line",'fd.total_ttc'=>"order_line",'fd.total_tva'=>"order_line",'fd.product_type'=>'order_line','fd.fk_product'=>'product','p.ref'=>'product','p.label'=>'product');
             $this->export_dependencies_array[$r]=array('order_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-			// Add extra fields
+			// Add extra fields object
 			$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseur'";
 			$resql=$this->db->query($sql);
 			if ($resql)    // This can fail when class is used on old database (during migration for example)
@@ -397,13 +432,48 @@ class modFournisseur extends DolibarrModules
 					$this->export_entities_array[$r][$fieldname]='order';
 				}
 			}
-			// End add axtra fields
+			// End add extra fields object
+			// Add extra fields line
+			$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseurdet'";
+			$resql=$this->db->query($sql);
+			if ($resql)    // This can fail when class is used on old database (during migration for example)
+			{
+				while ($obj=$this->db->fetch_object($resql))
+				{
+					$fieldname='extraline.'.$obj->name;
+					$fieldlabel=ucfirst($obj->label);
+					$typeFilter="Text";
+					switch($obj->type)
+					{
+						case 'int':
+						case 'double':
+						case 'price':
+							$typeFilter="Numeric";
+							break;
+						case 'date':
+						case 'datetime':
+							$typeFilter="Date";
+							break;
+						case 'boolean':
+							$typeFilter="Boolean";
+							break;
+						case 'sellist':
+							$typeFilter="List:".$obj->param;
+							break;
+					}
+					$this->export_fields_array[$r][$fieldname]=$fieldlabel;
+					$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
+					$this->export_entities_array[$r][$fieldname]='order_line';
+				}
+			}
+			// End add extra fields line
             $this->export_sql_start[$r]='SELECT DISTINCT ';
             $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
             $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
             $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commande_fournisseur as f';
             $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseur_extrafields as extra ON f.rowid = extra.fk_object,';
             $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commande_fournisseurdet as fd';
+            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseurdet_extrafields as extraline ON fd.rowid = extraline.fk_object';
             $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
             $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_commande';
             $this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('supplier_order',1).')';

From bd81dec1a3b6a7e33359e85222201d80f70fa502 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Mar 2015 19:28:38 +0100
Subject: [PATCH 41/93] Fix missing translation

---
 htdocs/core/modules/modContrat.class.php | 6 ++++--
 htdocs/langs/en_US/contracts.lang        | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index dc97964fa45..27299e0f291 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -41,7 +41,7 @@ class modContrat extends DolibarrModules
 	 */
 	function __construct($db)
 	{
-		global $conf;
+		global $conf, $langs;
 
 		$this->db = $db;
 		$this->numero = 54;
@@ -118,10 +118,12 @@ class modContrat extends DolibarrModules
 
 		// Exports
 		//--------
+		$langs->load("contracts");
+		
 		$r=1;
 
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='ContractAndServices';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_label[$r]=$langs->trans('ContractsAndLine');	// Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_icon[$r]='contract';
 		$this->export_permission[$r]=array(array("contrat","export"));
 		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode',
diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang
index 57ba3bb15d8..d1be0e6513f 100644
--- a/htdocs/langs/en_US/contracts.lang
+++ b/htdocs/langs/en_US/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired
 ServiceStatusClosed=Closed
 ServicesLegend=Services legend
 Contracts=Contracts
+ContractsAndLine=Contracts and line of contracts
 Contract=Contract
 NoContracts=No contracts
 MenuServices=Services

From 88a29b7c9cffe98e92a6b756d557759e3122f88d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Mar 2015 20:26:56 +0100
Subject: [PATCH 42/93] Add an advance permission to check/uncheck reception

---
 htdocs/core/modules/modFournisseur.class.php |  8 +++++
 htdocs/fourn/commande/dispatch.php           | 38 +++++++++++++++-----
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 9e26b0e8b81..84e6385694d 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -177,6 +177,14 @@ class modFournisseur extends DolibarrModules
             $this->rights[$r][4] = 'commande';
             $this->rights[$r][5] = 'receptionner';
 
+            $r++;
+            $this->rights[$r][0] = 1189;
+            $this->rights[$r][1] = 'Check/Uncheck a supplier order reception';
+            $this->rights[$r][2] = 'd';
+            $this->rights[$r][3] = 0;
+            $this->rights[$r][4] = 'commande_advance';
+            $this->rights[$r][5] = 'check';
+
             $r++;
             $this->rights[$r][0] = 1188;
             $this->rights[$r][1] = 'Supprimer une commande fournisseur';
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 2610111023a..f2dd3518868 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -67,7 +67,10 @@ $mesg='';
  * Actions
  */
 
-if ($action == 'checkdispatchline')
+if ($action == 'checkdispatchline' &&
+	! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande->receptionner))
+       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check)))
+)
 {
 	$supplierorderdispatch = new CommandeFournisseurDispatch($db);
 	$result=$supplierorderdispatch->fetch($lineid);
@@ -81,7 +84,10 @@ if ($action == 'checkdispatchline')
 	}
 }
 
-if ($action == 'uncheckdispatchline')
+if ($action == 'uncheckdispatchline' &&
+	! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande->receptionner))
+       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check)))
+)
 {
 	$supplierorderdispatch = new CommandeFournisseurDispatch($db);
 	$result=$supplierorderdispatch->fetch($lineid);
@@ -630,15 +636,31 @@ if ($id > 0 || ! empty($ref))
 
 						// Add button to check/uncheck disaptching
 						print '<td align="center">';
-						$disabled='';
-						if ($commande->statut == 5) $disabled=1;
-						if (empty($objp->status)) 
+						if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande->receptionner))
+       					|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check))
+							)
 						{
-							print '<a class="button'.($disabled?' buttonRefused':'').'" href="'.$_SERVER["PHP_SELF"]."?id=".$id."&action=checkdispatchline&lineid=".$objp->dispatchlineid.'">'.$langs->trans("Check").'</a>';
+							if (empty($objp->status)) 
+							{
+								print '<a class="button buttonRefused" href="#">'.$langs->trans("Check").'</a>';
+							}
+							else
+							{
+								print '<a class="button buttonRefused" href="#">'.$langs->trans("Uncheck").'</a>';
+							}
 						}
-						else 
+						else
 						{
-							print '<a class="button'.($disabled?' buttonRefused':'').'" href="'.$_SERVER["PHP_SELF"]."?id=".$id."&action=uncheckdispatchline&lineid=".$objp->dispatchlineid.'">'.$langs->trans("Uncheck").'</a>';
+							$disabled='';
+							if ($commande->statut == 5) $disabled=1;
+							if (empty($objp->status)) 
+							{
+								print '<a class="button'.($disabled?' buttonRefused':'').'" href="'.$_SERVER["PHP_SELF"]."?id=".$id."&action=checkdispatchline&lineid=".$objp->dispatchlineid.'">'.$langs->trans("Check").'</a>';
+							}
+							else 
+							{
+								print '<a class="button'.($disabled?' buttonRefused':'').'" href="'.$_SERVER["PHP_SELF"]."?id=".$id."&action=uncheckdispatchline&lineid=".$objp->dispatchlineid.'">'.$langs->trans("Uncheck").'</a>';
+							}
 						}
 						print '</td>';	
 					}

From 84695845bbd3c1e575efd958b07c9ea2de092829 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Mar 2015 21:20:56 +0100
Subject: [PATCH 43/93] Some fixes into translation and permissions

---
 htdocs/admin/perms.php                        |  11 +-
 htdocs/commande/card.php                      |   6 +-
 .../modules/modAskPriceSupplier.class.php     |   8 +-
 htdocs/core/modules/modCommande.class.php     |   5 +-
 htdocs/core/modules/modFournisseur.class.php  |   2 +-
 htdocs/langs/en_US/admin.lang                 |   2 +
 htdocs/user/perms.php                         | 354 +++++++++---------
 7 files changed, 197 insertions(+), 191 deletions(-)

diff --git a/htdocs/admin/perms.php b/htdocs/admin/perms.php
index 907ed389b38..3a7c47f3acf 100644
--- a/htdocs/admin/perms.php
+++ b/htdocs/admin/perms.php
@@ -67,7 +67,7 @@ llxHeader('',$langs->trans("DefaultRights"));
 print_fiche_titre($langs->trans("SecuritySetup"),'','setup');
 
 print $langs->trans("DefaultRightsDesc");
-print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
+print " ".$langs->trans("OnlyActiveElementsAreShown")."<br><br>\n";
 
 $db->begin();
 
@@ -115,16 +115,15 @@ foreach ($modulesdir as $dir)
 
 $db->commit();
 
-// Show warning about external users
-print info_admin(showModulesExludedForExternal($modules)).'<br>'."\n";
-print "<br>\n";
-
-
 $head=security_prepare_head();
 
 dol_fiche_head($head, 'default', $langs->trans("Security"));
 
 
+// Show warning about external users
+print info_admin(showModulesExludedForExternal($modules)).'<br>'."\n";
+
+
 print '<table class="noborder" width="100%">';
 
 // Affiche lignes des permissions
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 5f6c085831f..bef752f5954 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2243,7 +2243,11 @@ if ($action == 'create' && $user->rights->commande->creer)
 				}
 
 				// Cancel order
-				if ($object->statut == 1 && $user->rights->commande->annuler) {
+				if ($object->statut == 1 && 
+				    ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->cloturer))
+			       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->annuler)))
+				) 
+				{
 					print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=cancel">' . $langs->trans('Cancel') . '</a></div>';
 				}
 
diff --git a/htdocs/core/modules/modAskPriceSupplier.class.php b/htdocs/core/modules/modAskPriceSupplier.class.php
index d415d615756..4614b0b819d 100644
--- a/htdocs/core/modules/modAskPriceSupplier.class.php
+++ b/htdocs/core/modules/modAskPriceSupplier.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2010	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2004		Sebastien Di Cintio		<sdicintio@ressource-toi.org>
  * Copyright (C) 2004		Benoit Mortier			<benoit.mortier@opensides.be>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
@@ -21,11 +21,11 @@
  */
 
 /**
- *	\defgroup   askpricesupplier     Module de demandes de prix fournisseurs
- *	\brief      Module pour gerer la tenue des demandes fournisseurs
+ *	\defgroup   askpricesupplier     Module to request supplier price proposals
+ *	\brief      Module to request supplier price proposals
  *	\file       htdocs/core/modules/modAskPriceSupplier.class.php
  *	\ingroup    askpricesupplier
- *	\brief      Fichier de description et activation du module AskPriceSupplier
+ *	\brief      File to describe and activate module AskPriceSupplier
  */
 include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
 
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index c7fb5cfa587..53584e419eb 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -151,8 +151,9 @@ class modCommande extends DolibarrModules
 		$this->rights[$r][1] = 'Annuler les commandes clients';
 		$this->rights[$r][2] = 'd';
 		$this->rights[$r][3] = 0;
-		$this->rights[$r][4] = 'annuler';
-
+		$this->rights[$r][4] = 'order_advance';
+		$this->rights[$r][5] = 'annuler';
+		
 		$r++;
 		$this->rights[$r][0] = 89;
 		$this->rights[$r][1] = 'Supprimer les commandes clients';
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 84e6385694d..98986a045da 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -180,7 +180,7 @@ class modFournisseur extends DolibarrModules
             $r++;
             $this->rights[$r][0] = 1189;
             $this->rights[$r][1] = 'Check/Uncheck a supplier order reception';
-            $this->rights[$r][2] = 'd';
+            $this->rights[$r][2] = 'w';
             $this->rights[$r][3] = 0;
             $this->rights[$r][4] = 'commande_advance';
             $this->rights[$r][5] = 'check';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index e701db32106..b8590a1fc38 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -500,6 +500,8 @@ Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense Report
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1400Name=Accounting
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index b63b3e65ffc..a01b5ffa7ab 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -1,24 +1,24 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
- * Copyright (C) 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/>.
- */
+* Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+* Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+* Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+* Copyright (C) 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/user/perms.php
@@ -74,10 +74,10 @@ if ($user->id <> $id && ! $canreaduser) accessforbidden();
 
 if ($action == 'addrights' && $caneditperms)
 {
-    $edituser = new User($db);
+	$edituser = new User($db);
 	$edituser->fetch($id);
-    //$edituser->addrights($rights, $module, '', $entity); // TODO unused for the moment
-    $edituser->addrights($rights, $module);
+	//$edituser->addrights($rights, $module, '', $entity); // TODO unused for the moment
+	$edituser->addrights($rights, $module);
 
 	// Si on a touche a ses propres droits, on recharge
 	if ($id == $user->id)
@@ -90,10 +90,10 @@ if ($action == 'addrights' && $caneditperms)
 
 if ($action == 'delrights' && $caneditperms)
 {
-    $edituser = new User($db);
+	$edituser = new User($db);
 	$edituser->fetch($id);
-    //$edituser->delrights($rights, $module, '', $entity); // TODO unused for the moment
-    $edituser->delrights($rights, $module);
+	//$edituser->delrights($rights, $module, '', $entity); // TODO unused for the moment
+	$edituser->delrights($rights, $module);
 
 	// Si on a touche a ses propres droits, on recharge
 	if ($id == $user->id)
@@ -133,39 +133,39 @@ $modulesdir = dolGetModulesDirs();
 foreach($modulesdir as $dir)
 {
 	$handle=@opendir(dol_osencode($dir));
-    if (is_resource($handle))
-    {
-    	while (($file = readdir($handle))!==false)
-    	{
-    	    if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod'  && substr($file, dol_strlen($file) - 10) == '.class.php')
-    	    {
-    	        $modName = substr($file, 0, dol_strlen($file) - 10);
+	if (is_resource($handle))
+	{
+		while (($file = readdir($handle))!==false)
+		{
+			if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod'  && substr($file, dol_strlen($file) - 10) == '.class.php')
+			{
+				$modName = substr($file, 0, dol_strlen($file) - 10);
 
-    	        if ($modName)
-    	        {
-    	            include_once $dir.$file;
-    	            $objMod = new $modName($db);
+				if ($modName)
+				{
+					include_once $dir.$file;
+					$objMod = new $modName($db);
 
-    	            // Load all lang files of module
-    	            if (isset($objMod->langfiles) && is_array($objMod->langfiles))
-    	            {
-    	            	foreach($objMod->langfiles as $domain)
-    	            	{
-    	            		$langs->load($domain);
-    	            	}
-    	            }
-    	            // Load all permissions
-    	            if ($objMod->rights_class)
-    	            {
-    	            	$forceEntity=((! empty($conf->multicompany->enabled) && ! empty($fuser->entity)) ? $fuser->entity : null);
-    	                $ret=$objMod->insert_permissions(0, $forceEntity);
-    	                $modules[$objMod->rights_class]=$objMod;
-    	                //print "modules[".$objMod->rights_class."]=$objMod;";
-    	            }
-    	        }
-    	    }
-    	}
-    }
+					// Load all lang files of module
+					if (isset($objMod->langfiles) && is_array($objMod->langfiles))
+					{
+						foreach($objMod->langfiles as $domain)
+						{
+							$langs->load($domain);
+						}
+					}
+					// Load all permissions
+					if ($objMod->rights_class)
+					{
+						$forceEntity=((! empty($conf->multicompany->enabled) && ! empty($fuser->entity)) ? $fuser->entity : null);
+						$ret=$objMod->insert_permissions(0, $forceEntity);
+						$modules[$objMod->rights_class]=$objMod;
+						//print "modules[".$objMod->rights_class."]=$objMod;";
+					}
+				}
+			}
+		}
+	}
 }
 
 $db->commit();
@@ -195,19 +195,19 @@ dol_syslog("get user perms", LOG_DEBUG);
 $result=$db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($result);
-        array_push($permsuser,$obj->id);
-        $i++;
-    }
-    $db->free($result);
+	$num = $db->num_rows($result);
+	$i = 0;
+	while ($i < $num)
+	{
+		$obj = $db->fetch_object($result);
+		array_push($permsuser,$obj->id);
+		$i++;
+	}
+	$db->free($result);
 }
 else
 {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 // Lecture des droits groupes
@@ -231,27 +231,27 @@ dol_syslog("get user perms", LOG_DEBUG);
 $result=$db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($result);
-        if (! isset($permsgroupbyentity[$obj->entity]))
-        	$permsgroupbyentity[$obj->entity] = array();
-        array_push($permsgroupbyentity[$obj->entity], $obj->id);
-        $i++;
-    }
-    $db->free($result);
+	$num = $db->num_rows($result);
+	$i = 0;
+	while ($i < $num)
+	{
+		$obj = $db->fetch_object($result);
+		if (! isset($permsgroupbyentity[$obj->entity]))
+			$permsgroupbyentity[$obj->entity] = array();
+		array_push($permsgroupbyentity[$obj->entity], $obj->id);
+		$i++;
+	}
+	$db->free($result);
 }
 else
 {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 
 /*
  * Ecran ajout/suppression permission
- */
+*/
 
 print '<table class="border" width="100%">';
 
@@ -274,9 +274,9 @@ print '</tr>'."\n";
 
 print '</table><br>';
 
-if ($user->admin) print info_admin($langs->trans("WarningOnlyPermissionOfActivatedModules"), 0, 1).'<br>';
+if ($user->admin) print info_admin($langs->trans("WarningOnlyPermissionOfActivatedModules"));
 // Show warning about external users
-if (empty($user->societe_id)) print info_admin(showModulesExludedForExternal($modules)).'<br><br>'."\n";
+if (empty($user->societe_id)) print info_admin(showModulesExludedForExternal($modules))."\n";
 
 // For multicompany transversal mode
 // TODO Place a hook here
@@ -310,115 +310,115 @@ $sql.= " ORDER BY r.module, r.id";
 $result=$db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
-    $var = True;
-    $oldmod='';
+	$num = $db->num_rows($result);
+	$i = 0;
+	$var = True;
+	$oldmod='';
 
-    while ($i < $num)
-    {
-        $obj = $db->fetch_object($result);
+	while ($i < $num)
+	{
+		$obj = $db->fetch_object($result);
 
-        // Si la ligne correspond a un module qui n'existe plus (absent de includes/module), on l'ignore
-        if (empty($modules[$obj->module]))
-        {
-            $i++;
-            continue;
-        }
+		// Si la ligne correspond a un module qui n'existe plus (absent de includes/module), on l'ignore
+		if (empty($modules[$obj->module]))
+		{
+			$i++;
+			continue;
+		}
 
-        if (isset($obj->module) && ($oldmod <> $obj->module))
-        {
-        	$oldmod = $obj->module;
-        	$var = !$var;
+		if (isset($obj->module) && ($oldmod <> $obj->module))
+		{
+			$oldmod = $obj->module;
+			$var = !$var;
 
-        	// Rupture detectee, on recupere objMod
-        	$objMod=$modules[$obj->module];
-        	$picto=($objMod->picto?$objMod->picto:'generic');
+			// Rupture detectee, on recupere objMod
+			$objMod=$modules[$obj->module];
+			$picto=($objMod->picto?$objMod->picto:'generic');
 
-        	if ($caneditperms && (empty($objMod->rights_admin_allowed) || empty($fuser->admin)))
-        	{
-        		// On affiche ligne pour modifier droits
-        		print '<tr '. $bc[$var].'>';
-        		print '<td class="nowrap">'.img_object('',$picto).' '.$objMod->getName();
-        		print '<a name="'.$objMod->getName().'">&nbsp;</a></td>';
-        		print '<td align="center" class="nowrap">';
-        		print '<a title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
-        		print '/';
-        		print '<a title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="perms.php?id='.$fuser->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>";
-        		print '</td>';
-        		print '<td colspan="2">&nbsp;</td>';
-        		print '</tr>'."\n";
-        	}
-        }
+			if ($caneditperms && (empty($objMod->rights_admin_allowed) || empty($fuser->admin)))
+			{
+				// On affiche ligne pour modifier droits
+				print '<tr '. $bc[$var].'>';
+				print '<td class="nowrap">'.img_object('',$picto).' '.$objMod->getName();
+				print '<a name="'.$objMod->getName().'">&nbsp;</a></td>';
+				print '<td align="center" class="nowrap">';
+				print '<a title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>";
+				print '/';
+				print '<a title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="perms.php?id='.$fuser->id.'&amp;action=delrights&amp;entity='.$entity.'&amp;module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>";
+				print '</td>';
+				print '<td colspan="2">&nbsp;</td>';
+				print '</tr>'."\n";
+			}
+		}
 
-        print '<tr '. $bc[$var].'>';
+		print '<tr '. $bc[$var].'>';
 
-        // Picto and label of permission
-        print '<td>'.img_object('',$picto).' '.$objMod->getName().'</td>';
+		// Picto and label of permission
+		print '<td>'.img_object('',$picto).' '.$objMod->getName().'</td>';
 
-        // Permission and tick
-        if (! empty($fuser->admin) && ! empty($objMod->rights_admin_allowed))    // Permission own because admin
-        {
-        	if ($caneditperms)
-        	{
-        		print '<td align="center">'.img_picto($langs->trans("Administrator"),'star').'</td>';
-        	}
-        	print '<td align="center" class="nowrap">';
-        	print img_picto($langs->trans("Active"),'tick');
-        	print '</td>';
-        }
-        else if (in_array($obj->id, $permsuser))					// Permission own by user
-        {
-        	if ($caneditperms)
-        	{
-        		print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=delrights&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
-        	}
-        	print '<td align="center" class="nowrap">';
-        	print img_picto($langs->trans("Active"),'tick');
-        	print '</td>';
-        }
+		// Permission and tick
+		if (! empty($fuser->admin) && ! empty($objMod->rights_admin_allowed))    // Permission own because admin
+		{
+			if ($caneditperms)
+			{
+				print '<td align="center">'.img_picto($langs->trans("Administrator"),'star').'</td>';
+			}
+			print '<td align="center" class="nowrap">';
+			print img_picto($langs->trans("Active"),'tick');
+			print '</td>';
+		}
+		else if (in_array($obj->id, $permsuser))					// Permission own by user
+		{
+			if ($caneditperms)
+			{
+				print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=delrights&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_remove($langs->trans("Remove")).'</a></td>';
+			}
+			print '<td align="center" class="nowrap">';
+			print img_picto($langs->trans("Active"),'tick');
+			print '</td>';
+		}
 
-        else if (is_array($permsgroupbyentity[$entity]))
-        {
-	        if (in_array($obj->id, $permsgroupbyentity[$entity]))	// Permission own by group
-	        {
-	        	if ($caneditperms)
-	        	{
-	        		print '<td align="center">';
-	        		print $form->textwithtooltip($langs->trans("Inherited"),$langs->trans("PermissionInheritedFromAGroup"));
-	        		print '</td>';
-	        	}
-	        	print '<td align="center" class="nowrap">';
-	        	print img_picto($langs->trans("Active"),'tick');
-	        	print '</td>';
-	        }
-	        else
-	        {
-	        	// Do not own permission
-	        	if ($caneditperms)
-	        	{
-	        		print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_add($langs->trans("Add")).'</a></td>';
-	        	}
-	        	print '<td>&nbsp</td>';
-	        }
-        }
-        else
-        {
-        	// Do not own permission
-        	if ($caneditperms)
-        	{
-        		print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_add($langs->trans("Add")).'</a></td>';
-        	}
-        	print '<td>&nbsp</td>';
-        }
+		else if (is_array($permsgroupbyentity[$entity]))
+		{
+			if (in_array($obj->id, $permsgroupbyentity[$entity]))	// Permission own by group
+			{
+				if ($caneditperms)
+				{
+					print '<td align="center">';
+					print $form->textwithtooltip($langs->trans("Inherited"),$langs->trans("PermissionInheritedFromAGroup"));
+					print '</td>';
+				}
+				print '<td align="center" class="nowrap">';
+				print img_picto($langs->trans("Active"),'tick');
+				print '</td>';
+			}
+			else
+			{
+				// Do not own permission
+				if ($caneditperms)
+				{
+					print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_add($langs->trans("Add")).'</a></td>';
+				}
+				print '<td>&nbsp</td>';
+			}
+		}
+		else
+		{
+			// Do not own permission
+			if ($caneditperms)
+			{
+				print '<td align="center"><a href="perms.php?id='.$fuser->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_add($langs->trans("Add")).'</a></td>';
+			}
+			print '<td>&nbsp</td>';
+		}
 
-        $perm_libelle=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$obj->libelle));
-        print '<td>'.$perm_libelle. '</td>';
+		$perm_libelle=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$obj->libelle));
+		print '<td>'.$perm_libelle. '</td>';
 
-        print '</tr>'."\n";
+		print '</tr>'."\n";
 
-        $i++;
-    }
+		$i++;
+	}
 }
 else dol_print_error($db);
 print '</table>';

From 94acbeaa221f8233250ca216a97bf9c824615b16 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 9 Mar 2015 21:40:24 +0100
Subject: [PATCH 44/93] Prepare perms on extrafields

---
 htdocs/core/class/extrafields.class.php       | 37 +++++++++++++------
 .../install/mysql/migration/3.7.0-3.8.0.sql   |  2 +
 .../install/mysql/tables/llx_extrafields.sql  |  1 +
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index f1ad5d6687f..e7cc87efef5 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -48,11 +48,13 @@ class ExtraFields
 	var $attribute_required;
 	// Array to store parameters of attribute (used in select type)
 	var $attribute_param;
-	// Int to store position of attribute
+	// Array to store position of attribute
 	var $attribute_pos;
-	// Int to store if attribute is editable regardless of the document status
+	// Array to store if attribute is editable regardless of the document status
 	var $attribute_alwayseditable;
-
+	// Array to store permission to check
+	var $attribute_perms;
+	
 	var $error;
 	var $errno;
 
@@ -90,6 +92,7 @@ class ExtraFields
 		$this->attribute_elementtype = array();
 		$this->attribute_unique = array();
 		$this->attribute_required = array();
+		$this->attribute_perms = array();
 	}
 
 	/**
@@ -106,9 +109,10 @@ class ExtraFields
 	 *  @param	string	$default_value		Defaulted value
 	 *  @param  array	$param				Params for field
 	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
+	 *  @param	string	$perms				Permission to check
 	 *  @return int      					<=0 if KO, >0 if OK
 	 */
-	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param=0, $alwayseditable=0)
+	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param=0, $alwayseditable=0, $perms='')
 	{
 		if (empty($attrname)) return -1;
 		if (empty($label)) return -1;
@@ -124,7 +128,7 @@ class ExtraFields
 		if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate')
 		{
 			// Add declaration of field into table
-			$result2=$this->create_label($attrname,$label,$type,$pos,$size,$elementtype, $unique, $required, $param, $alwayseditable);
+			$result2=$this->create_label($attrname,$label,$type,$pos,$size,$elementtype, $unique, $required, $param, $alwayseditable, $perms);
 			$err2=$this->errno;
 			if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS'))
 			{
@@ -225,9 +229,10 @@ class ExtraFields
 	 *  @param	int				$required		Is field required or not
 	 *  @param  array||string	$param			Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
 	 *  @param  int				$alwayseditable	Is attribute always editable regardless of the document status
+	 *  @param	string			$perms			Permission to check
 	 *  @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='', $alwayseditable=0)
+	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='')
 	{
 		global $conf;
 
@@ -251,7 +256,7 @@ class ExtraFields
 				$params='';
 			}
 
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(name, label, type, pos, size, entity, elementtype, fieldunique, fieldrequired, param, alwayseditable)";
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(name, label, type, pos, size, entity, elementtype, fieldunique, fieldrequired, param, alwayseditable, perms)";
 			$sql.= " VALUES('".$attrname."',";
 			$sql.= " '".$this->db->escape($label)."',";
 			$sql.= " '".$type."',";
@@ -263,6 +268,7 @@ class ExtraFields
 			$sql.= " '".$required."',";
 			$sql.= " '".$params."',";
 			$sql.= " '".$alwayseditable."'";
+			$sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null");
 			$sql.=')';
 
 			dol_syslog(get_class($this)."::create_label", LOG_DEBUG);
@@ -363,9 +369,10 @@ class ExtraFields
 	 *  @param	int		$pos				Position of attribute
 	 *  @param  array	$param				Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
 	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
+	 *  @param	string	$perms				Permission to check
 	 * 	@return	int							>0 if OK, <=0 if KO
 	 */
-	function update($attrname,$label,$type,$length,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0)
+	function update($attrname,$label,$type,$length,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0, $perms='')
 	{
 		if ($elementtype == 'thirdparty') $elementtype='societe';
 
@@ -402,7 +409,7 @@ class ExtraFields
 			{
 				if ($label)
 				{
-					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable);
+					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms);
 				}
 				if ($result > 0)
 				{
@@ -451,12 +458,13 @@ class ExtraFields
 	 *  @param	int		$pos				Position of attribute
 	 *  @param  array	$param				Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
 	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
+	 *  @param	string	$perms				Permission to check
 	 *  @return	int							<=0 if KO, >0 if OK
 	 */
-	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0)
+	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='')
 	{
 		global $conf;
-		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required);
+		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms);
 
 		if ($elementtype == 'thirdparty') $elementtype='societe';
 
@@ -485,6 +493,7 @@ class ExtraFields
 			$sql.= " elementtype,";
 			$sql.= " fieldunique,";
 			$sql.= " fieldrequired,";
+			$sql.= " perms,";
 			$sql.= " pos,";
 			$sql.= " alwayseditable,";
 			$sql.= " param";
@@ -497,6 +506,7 @@ class ExtraFields
 			$sql.= " '".$elementtype."',";
 			$sql.= " '".$unique."',";
 			$sql.= " '".$required."',";
+			$sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null");
 			$sql.= " '".$pos."',";
 			$sql.= " '".$alwayseditable."',";
 			$sql.= " '".$param."'";
@@ -542,7 +552,7 @@ class ExtraFields
 		// For avoid conflicts with external modules
 		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
 
-		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable";
+		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms";
 		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
 		$sql.= " WHERE entity IN (0,".$conf->entity.")";
 		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";
@@ -571,6 +581,7 @@ class ExtraFields
 					$this->attribute_param[$tab->name]=unserialize($tab->param);
 					$this->attribute_pos[$tab->name]=$tab->pos;
 					$this->attribute_alwayseditable[$tab->name]=$tab->alwayseditable;
+					$this->attribute_perms[$tab->name]=$tab->perms;
 				}
 			}
 		}
@@ -603,6 +614,7 @@ class ExtraFields
 		$unique=$this->attribute_unique[$key];
 		$required=$this->attribute_required[$key];
 		$param=$this->attribute_param[$key];
+		$perms=$this->attribute_perms[$key];
 		if ($type == 'date')
 		{
 			$showsize=10;
@@ -1040,6 +1052,7 @@ class ExtraFields
 		$unique=$this->attribute_unique[$key];
 		$required=$this->attribute_required[$key];
 		$params=$this->attribute_param[$key];
+		$perms=$this->attribute_perms[$key];
 		if ($type == 'date')
 		{
 			$showsize=10;
diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index 2a36ef78737..22890a149ce 100755
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -19,6 +19,8 @@
 -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user      WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup);
 
 
+ALTER TABLE llx_extrafields ADD COLUMN perms varchar(255) after fieldrequired;
+
 UPDATE llx_projet_task_time SET task_datehour = task_date where task_datehour IS NULL;
 ALTER TABLE llx_projet_task_time ADD COLUMN task_date_withhour integer DEFAULT 0 after task_datehour;
 
diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql
index f91d21fedb1..11271125508 100644
--- a/htdocs/install/mysql/tables/llx_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_extrafields.sql
@@ -29,6 +29,7 @@ create table llx_extrafields
 	size            varchar(8) DEFAULT NULL,
 	fieldunique     integer DEFAULT 0,
 	fieldrequired   integer DEFAULT 0,
+	perms			varchar(255),
 	pos             integer DEFAULT 0,
 	alwayseditable  integer DEFAULT 0,
 	param		text

From a065b8a9b4f732015b9a188b93361e160e08dc36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Votruba?= <info@tomasvotruba.cz>
Date: Tue, 10 Mar 2015 09:57:40 +0100
Subject: [PATCH 45/93] travis: PHP 7.0 nightly added

---
 .travis.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 031226251c1..e3348e97b67 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,10 +18,15 @@ services:
 language: php
 php:
 # - "5.2" is not supported because pyrus to install PHP_Codesniffer is not available
- - "5.3"
- - "5.4"
- - "5.5" 
- - "5.6"
+ - 5.3
+ - 5.4
+ - 5.5 
+ - 5.6
+ - 7.0
+ 
+matrix:
+  allow_failures:
+    - php: 7.0
 
 env:
  - DB=mysql

From d847f9581e2c1057bd09275b221797b3d4cb8f44 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Mar 2015 11:31:23 +0100
Subject: [PATCH 46/93] Fix generation of RUM number. Show it on card to help
 debug.

---
 .../class/bonprelevement.class.php            | 25 +++++++++++++++----
 .../class/companybankaccount.class.php        |  8 +++++-
 htdocs/societe/rib.php                        | 16 ++++++++++--
 3 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 2c07baba5a0..eb0344d7010 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1300,7 +1300,7 @@ class BonPrelevement extends CommonObject
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
-					$fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->nom, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $ListOfFactures, $obj->idfac, $obj->iban, $obj->bic, $obj->datec, $obj->drum);
+					$fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->nom, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $ListOfFactures, $obj->idfac, $obj->iban, $obj->bic, $this->db->jdate($obj->datec), $obj->drum);
 					$this->total = $this->total + $obj->somme;
 					$i++;
 				}
@@ -1502,6 +1502,20 @@ class BonPrelevement extends CommonObject
     }
 
 
+    /**
+     * Build RUM number for a customer bank account
+     *
+     * @param	string		$row_code_client	Customer code (soc.code_client)
+     * @param	int			$row_datec			Creation date of bank account (rib.datec)
+     * @param	string		$row_drum			Id of customer bank account (rib.rowid)
+     * @return 	string		RUM number
+     */
+    static function buildRumNumber($row_code_client, $row_datec, $row_drum)
+    {
+		$pre = ($row_datec > 1359673200) ? 'Rum' : '++R';
+		return $pre.$row_code_client.'-'.$row_drum.'-'.date('U', $row_datec);
+    }
+
     /**
      *	Write recipient of request (customer)
      *
@@ -1520,7 +1534,7 @@ class BonPrelevement extends CommonObject
      *	@param	string		$row_iban			rib.iban_prefix AS iban,
      *	@param	string		$row_bic			rib.bic AS bic,
      *	@param	string		$row_datec			rib.datec,
-     *	@param	string		$row_drum			rib.rowid AS drum
+     *	@param	string		$row_drum			rib.rowid used to generate rum
      *	@return	string							Return string with SEPA part DrctDbtTxInf
      */
     function EnregDestinataireSEPA($row_code_client, $row_nom, $row_address, $row_zip, $row_town, $row_country_code, $row_cb, $row_cg, $row_cc, $row_somme, $row_facnumber, $row_idfac, $row_iban, $row_bic, $row_datec, $row_drum)
@@ -1530,10 +1544,11 @@ class BonPrelevement extends CommonObject
 
 		// Define value for RUM
 		// Example:  RUMCustomerCode-CustomerBankAccountId-01424448606	(note: Date is date of creation of CustomerBankAccountId)
-		$Date_Rum = strtotime($row_datec);
+		$Rum = $this->buildRumNumber($row_code_client, $row_datec, $row_drum);
+
+		// Define date of RUM signature
 		$DtOfSgntr = dol_print_date($row_datec, '%Y-%m-%d');
-		$pre = ($date_Rum > 1359673200) ? 'Rum' : '++R';
-		$Rum = $pre.$row_code_client.$row_drum.'-0'.date('U', $Date_Rum);
+
 		$XML_DEBITOR ='';
 		$XML_DEBITOR .='			<DrctDbtTxInf>'.$CrLf;
 		$XML_DEBITOR .='				<PmtId>'.$CrLf;
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 37e646d6b88..255ab6a05a6 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -49,6 +49,10 @@ class CompanyBankAccount extends Account
     var $owner_address;
     var $default_rib;
 
+    var $datec;
+    var $datem;
+
+
     /**
 	 *  Constructor
 	 *
@@ -174,7 +178,7 @@ class CompanyBankAccount extends Account
     {
         if (empty($id) && empty($socid)) return -1;
 
-        $sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio, owner_address, default_rib, label";
+        $sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio, owner_address, default_rib, label, datec, tms as datem";
         $sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
         if ($id)    $sql.= " WHERE rowid = ".$id;
         if ($socid) $sql.= " WHERE fk_soc  = ".$socid." AND default_rib = 1";
@@ -200,6 +204,8 @@ class CompanyBankAccount extends Account
                 $this->owner_address   = $obj->owner_address;
                 $this->label           = $obj->label;
                 $this->default_rib     = $obj->default_rib;
+                $this->datec           = $this->db->jdate($obj->datec);
+                $this->datem           = $this->db->jdate($obj->datem);
             }
             $this->db->free($resql);
 
diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php
index ab14d757f6f..5af9d2a7df2 100644
--- a/htdocs/societe/rib.php
+++ b/htdocs/societe/rib.php
@@ -29,6 +29,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 
 $langs->load("companies");
 $langs->load("commercial");
@@ -191,6 +192,7 @@ if ($action == 'confirm_delete' && $_GET['confirm'] == 'yes')
  */
 
 $form = new Form($db);
+$prelevement = new BonPrelevement($db);
 
 llxHeader();
 
@@ -320,11 +322,11 @@ if ($socid && $action != 'edit' && $action != "create")
 
     print "<br>";
 
-    
+
     /*
      * List of bank accounts
      */
-    
+
     print_titre($langs->trans("AllRIB"));
 
     $rib_list = $soc->get_all_rib();
@@ -339,6 +341,10 @@ if ($socid && $action != 'edit' && $action != "create")
         print_liste_field_titre($langs->trans("RIB"));
         print_liste_field_titre($langs->trans("IBAN"));
         print_liste_field_titre($langs->trans("BIC"));
+        if (! empty($conf->prelevement->enabled))
+        {
+			print '<td>RUM</td>';
+        }
         print_liste_field_titre($langs->trans("DefaultRIB"), '', '', '', '', 'align="center"');
         print '<td width="40"></td>';
         print '</tr>';
@@ -356,6 +362,12 @@ if ($socid && $action != 'edit' && $action != "create")
             print '<td>'.$rib->iban.'</td>';
             // BIC
             print '<td>'.$rib->bic.'</td>';
+
+            if (! empty($conf->prelevement->enabled))
+            {
+				print '<td>'.$prelevement->buildRumNumber($soc->code_client, $rib->datec, $rib->id).'</td>';
+            }
+
             // Default
             print '<td align="center" width="70">';
             if (!$rib->default_rib) {

From 194260fc5b45128d851c74660a989edc4f08065c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Mar 2015 13:25:25 +0100
Subject: [PATCH 47/93] NEW: Add search box for supplier order search.

---
 htdocs/comm/index.php          | 15 +++++++++++++++
 htdocs/fourn/commande/list.php |  2 +-
 htdocs/langs/en_US/orders.lang |  1 +
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index ea0494866a1..cb5a07c32d3 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -103,6 +103,21 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 	print "</table></form><br>\n";
 }
 
+// Search supplier order
+if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
+{
+	$var=false;
+	print '<form method="post" action="'.DOL_URL_ROOT.'/fourn/commande/list.php">';
+	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+	print '<table class="noborder nohover" width="100%">';
+	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchASupplierOrder").'</td></tr>';
+	print '<tr '.$bc[$var].'><td>';
+	print '<label for="search_ref">'.$langs->trans("Ref").'</label>:</td><td><input type="text" class="flat" name="search_ref" id="search_ref" size=18></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
+	print '<tr '.$bc[$var].'><td class="nowrap"><label for="search_all">'.$langs->trans("Other").'</label>:</td><td><input type="text" class="flat" name="search_all" id="search_all" size="18"></td>';
+	print '</tr>';
+	print "</table></form><br>\n";
+}
+
 // Search contract
 if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
 {
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 7e525a9d080..386caad8134 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -140,7 +140,7 @@ if ($search_ttc != '')
 }
 if ($sall)
 {
-	$sql .= natural_search(array('cf.ref', 'cf.note_public', 'cf.note_private'), $sall);
+	$sql .= natural_search(array('cf.ref', 'cf.ref_supplier', 'cf.note_public', 'cf.note_private'), $sall);
 }
 if ($socid) $sql.= " AND s.rowid = ".$socid;
 
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index ea3659b90de..602bd1bda59 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -59,6 +59,7 @@ MenuOrdersToBill=Orders delivered
 MenuOrdersToBill2=Billable orders
 SearchOrder=Search order
 SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
 ShipProduct=Ship product
 Discount=Discount
 CreateOrder=Create Order

From 12be50d4baa4eaa6c693275e38436098fb021bb9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Mar 2015 13:50:05 +0100
Subject: [PATCH 48/93] Doxygen

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d7fc398e082..601908bc412 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4952,7 +4952,7 @@ function dol_getmypid()
  * @param 	string 			$value 		The value to look for.
  *                          		    If param $numeric is 0, can contains several keywords separated with a space, like "keyword1 keyword2" = We want record field like keyword1 and field like keyword2
  *                             			If param $numeric is 1, can contains an operator <>= like "<10" or ">=100.5 < 1000"
- * @param	string			$number		0=value is list of keywords, 1=value is a numeric test
+ * @param	string			$numeric	0=value is list of keywords, 1=value is a numeric test
  * @return 	string 			$res 		The statement to append to the SQL query
  */
 function natural_search($fields, $value, $numeric=0)

From 9a3e5d7fc593e985c453a5c58ec9c447b477665f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Mar 2015 13:58:26 +0100
Subject: [PATCH 49/93] Fix code unreachable

---
 .../core/modules/askpricesupplier/doc/pdf_aurore.modules.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php b/htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
index 2c817314ecb..753c9ad9237 100644
--- a/htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
@@ -591,12 +591,9 @@ class pdf_aurore extends ModelePDFAskPriceSupplier
 		}
 		else
 		{
-			$this->error=$langs->trans("ErrorConstantNotDefined","PROP_OUTPUTDIR");
+			$this->error=$langs->trans("ErrorConstantNotDefined","ASKSUPPLIERPICE_OUTPUTDIR");
 			return 0;
 		}
-
-		$this->error=$langs->trans("ErrorUnknown");
-		return 0;   // Erreur par defaut
 	}
 
 	/**

From b564b754fcfd67d97a27ec82cb91e95a3bb57358 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Mar 2015 14:09:29 +0100
Subject: [PATCH 50/93] Doxygen

---
 htdocs/core/db/DoliDB.class.php   | 3 ++-
 htdocs/core/lib/functions.lib.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 67e3022d6e3..94f1568c5a2 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -1,6 +1,7 @@
 <?php
 /*
  * Copyright (C) 2013-2014 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2014-2015 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
@@ -270,7 +271,7 @@ abstract class DoliDB implements Database
 	 *
 	 * 	@param	string				$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
 	 *	@param	int					$gm			1=Input informations are GMT values, otherwise local to server TZ
-	 *	@return	timestamp|string				Date TMS
+	 *	@return	int|string						Date TMS
 	 */
 	function jdate($string, $gm=false)
 	{
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 601908bc412..63c0f6ce433 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1157,7 +1157,7 @@ function dol_getdate($timestamp,$fast=false)
  *	@param	int			$year			Year
  *	@param	mixed		$gm				True or 1 or 'gmt'=Input informations are GMT values, False or 0 or 'server' = local to server TZ, 'user' = local to user TZ
  *	@param	int			$check			0=No check on parameters (Can use day 32, etc...)
- *	@return	timestamp|string			Date as a timestamp, '' or false if error
+ *	@return	int|string					Date as a timestamp, '' or false if error
  * 	@see 								dol_print_date, dol_stringtotime, dol_getdate
  */
 function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1)

From 209f8946d051a558fd8aa37df7a07aaf0c4702b6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Mar 2015 14:17:58 +0100
Subject: [PATCH 51/93] All files must be lowercase

---
 htdocs/adherents/class/adherent.class.php                     | 4 ++--
 htdocs/compta/bank/class/account.class.php                    | 4 ++--
 ...orkboardResponse.class.php => workboardresponse.class.php} | 4 ++--
 htdocs/index.php                                              | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename htdocs/core/class/{WorkboardResponse.class.php => workboardresponse.class.php} (94%)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 6b9a8768495..78195bfa868 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1721,8 +1721,8 @@ class Adherent extends CommonObject
     /**
      *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
      *
-     *      @param	User	$user   	Objet user
-     *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+     *      @param	User	$user   		Objet user
+     *      @return WorkboardResponse|int 	<0 if KO, WorkboardResponse if OK
      */
     function load_board($user)
     {
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index cfbda320fb7..80262babbbf 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -917,7 +917,7 @@ class Account extends CommonObject
      *
      *      @param	User	$user        		Objet user
      *		@param	int		$filteraccountid	To get info for a particular account id
-     *      @return WorkboardResponse|int <0 if KO, WorkboardResponse if OK
+     *      @return WorkboardResponse|int 		<0 if KO, WorkboardResponse if OK
      */
     function load_board($user,$filteraccountid=0)
     {
@@ -940,7 +940,7 @@ class Account extends CommonObject
 	        $langs->load("banks");
 	        $now=dol_now();
 
-            require_once DOL_DOCUMENT_ROOT.'/core/class/WorkboardResponse.class.php';
+            require_once DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
 
 	        $response = new WorkboardResponse();
 	        $response->warning_delay=$conf->bank->rappro->warning_delay/60/60/24;
diff --git a/htdocs/core/class/WorkboardResponse.class.php b/htdocs/core/class/workboardresponse.class.php
similarity index 94%
rename from htdocs/core/class/WorkboardResponse.class.php
rename to htdocs/core/class/workboardresponse.class.php
index c36b50b421e..13de74281ff 100644
--- a/htdocs/core/class/WorkboardResponse.class.php
+++ b/htdocs/core/class/workboardresponse.class.php
@@ -49,8 +49,8 @@ class WorkboardResponse
 	public $url_late;
 
 	/**
-	 * Delay time to mark an item as late
-	 * @var int
+	 * Delay time to mark an item as late. In number of days.
+	 * @var double
 	 */
 	public $warning_delay;
 
diff --git a/htdocs/index.php b/htdocs/index.php
index c13c15d80eb..15967013e8a 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -311,7 +311,7 @@ print '</tr>'."\n";
 // Do not include sections without management permission
 //
 
-require DOL_DOCUMENT_ROOT.'/core/class/WorkboardResponse.class.php';
+require DOL_DOCUMENT_ROOT.'/core/class/workboardresponse.class.php';
 
 // Number of actions to do (late)
 if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->read)

From db4bbf46fc98a42b7007564bab4c165ecb6229cc Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Tue, 10 Mar 2015 14:43:13 +0100
Subject: [PATCH 52/93] New : allow to edit social contribution amount

---
 htdocs/compta/sociales/charges.php            | 77 +++++++++++--------
 .../sociales/class/chargesociales.class.php   |  3 +-
 2 files changed, 49 insertions(+), 31 deletions(-)

diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php
index afe2c27a3be..a7a9e76a78b 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/charges.php
@@ -77,8 +77,10 @@ if ($action == 'confirm_delete' && $confirm == 'yes')
 // Add social contribution
 if ($action == 'add' && $user->rights->tax->charges->creer)
 {
-	$dateech=@dol_mktime($_POST["echhour"],$_POST["echmin"],$_POST["echsec"],$_POST["echmonth"],$_POST["echday"],$_POST["echyear"]);
-	$dateperiod=@dol_mktime($_POST["periodhour"],$_POST["periodmin"],$_POST["periodsec"],$_POST["periodmonth"],$_POST["periodday"],$_POST["periodyear"]);
+	$dateech=@dol_mktime(GETPOST('echhour'),GETPOST('echmin'),GETPOST('echsec'),GETPOST('echmonth'),GETPOST('echday'),GETPOST('echyear'));
+	$dateperiod=@dol_mktime(GETPOST('periodhour'),GETPOST('periodmin'),GETPOST('periodsec'),GETPOST('periodmonth'),GETPOST('periodday'),GETPOST('periodyear'));
+    $amount=GETPOST('amount');
+    $actioncode=GETPOST('actioncode');
 	if (! $dateech)
 	{
 		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateDue")), 'errors');
@@ -89,12 +91,12 @@ if ($action == 'add' && $user->rights->tax->charges->creer)
 		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Period")), 'errors');
 		$action = 'create';
 	}
-	elseif (! $_POST["actioncode"] > 0)
+	elseif (! $actioncode > 0)
 	{
 		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Type")), 'errors');
 		$action = 'create';
 	}
-	elseif (! $_POST["amount"])
+	elseif (empty($amount))
 	{
 		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Amount")), 'errors');
 		$action = 'create';
@@ -103,11 +105,11 @@ if ($action == 'add' && $user->rights->tax->charges->creer)
 	{
 		$chargesociales=new ChargeSociales($db);
 
-		$chargesociales->type=$_POST["actioncode"];
-		$chargesociales->lib=$_POST["label"];
+		$chargesociales->type=$actioncode;
+		$chargesociales->lib=GETPOST('label');
 		$chargesociales->date_ech=$dateech;
 		$chargesociales->periode=$dateperiod;
-		$chargesociales->amount=$_POST["amount"];
+		$chargesociales->amount=price2num($amount);
 
 		$id=$chargesociales->create($user);
 		if ($id <= 0)
@@ -120,32 +122,39 @@ if ($action == 'add' && $user->rights->tax->charges->creer)
 
 if ($action == 'update' && ! $_POST["cancel"] && $user->rights->tax->charges->creer)
 {
-	$dateech=dol_mktime($_POST["echhour"],$_POST["echmin"],$_POST["echsec"],$_POST["echmonth"],$_POST["echday"],$_POST["echyear"]);
-	$dateperiod=dol_mktime($_POST["periodhour"],$_POST["periodmin"],$_POST["periodsec"],$_POST["periodmonth"],$_POST["periodday"],$_POST["periodyear"]);
-	if (! $dateech)
-	{
-		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateDue")), 'errors');
-		$action = 'edit';
-	}
-	elseif (! $dateperiod)
-	{
-		setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Period")), 'errors');
-		$action = 'edit';
-	}
+    $dateech=dol_mktime(GETPOST('echhour'),GETPOST('echmin'),GETPOST('echsec'),GETPOST('echmonth'),GETPOST('echday'),GETPOST('echyear'));
+    $dateperiod=dol_mktime(GETPOST('periodhour'),GETPOST('periodmin'),GETPOST('periodsec'),GETPOST('periodmonth'),GETPOST('periodday'),GETPOST('periodyear'));
+    $amount=GETPOST('amount');
+    if (! $dateech)
+    {
+        setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateDue")), 'errors');
+        $action = 'edit';
+    }
+    elseif (! $dateperiod)
+    {
+        setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Period")), 'errors');
+        $action = 'edit';
+    }
+    elseif (empty($amount))
+    {
+        setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Amount")), 'errors');
+        $action = 'edit';
+    }
 	else
 	{
-		$chargesociales=new ChargeSociales($db);
-		$result=$chargesociales->fetch($_GET["id"]);
+        $chargesociales=new ChargeSociales($db);
+        $result=$chargesociales->fetch($id);
 
-		$chargesociales->lib=$_POST["label"];
-		$chargesociales->date_ech=$dateech;
-		$chargesociales->periode=$dateperiod;
+        $chargesociales->lib=GETPOST('label');
+        $chargesociales->date_ech=$dateech;
+        $chargesociales->periode=$dateperiod;
+        $chargesociales->amount=price2num($amount);
 
-		$result=$chargesociales->update($user);
-		if ($result <= 0)
-		{
-			setEventMessage($chargesociales->error, 'errors');
-		}
+        $result=$chargesociales->update($user);
+        if ($result <= 0)
+        {
+            setEventMessage($chargesociales->error, 'errors');
+        }
 	}
 }
 
@@ -437,7 +446,15 @@ if ($id > 0)
 		}
 
 		// Amount
-		print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
+        if ($action == 'edit')
+        {
+            print '<tr><td>'.$langs->trans("AmountTTC")."</td><td>";
+            print '<input type="text" name="amount" size="12" class="flat" value="'.$object->amount.'">';
+            print "</td></tr>";
+        }
+        else {
+            print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
+        }
 
 		// Status
 		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4, $totalpaye).'</td></tr>';
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 96f55ce34ba..6f68e76303c 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -266,7 +266,8 @@ class ChargeSociales extends CommonObject
         $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales";
         $sql.= " SET libelle='".$this->db->escape($this->lib)."',";
         $sql.= " date_ech='".$this->db->idate($this->date_ech)."',";
-        $sql.= " periode='".$this->db->idate($this->periode)."'";
+        $sql.= " periode='".$this->db->idate($this->periode)."',";
+        $sql.= " amount='".price2num($this->amount,'MT')."'";
         $sql.= " WHERE rowid=".$this->id;
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);

From f90df57dc567d67c6ac341d57d94d839ae0b9007 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Tue, 10 Mar 2015 14:49:36 +0100
Subject: [PATCH 53/93] New : disallow social contribution modification if paid

---
 htdocs/compta/sociales/charges.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php
index a7a9e76a78b..251bd6f7f6a 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/charges.php
@@ -483,7 +483,7 @@ if ($id > 0)
 			print "<div class=\"tabsAction\">\n";
 
 			// Edit
-			if ($user->rights->tax->charges->creer)
+			if ($object->paye == 0 && $user->rights->tax->charges->creer)
 			{
 				print "<a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/sociales/charges.php?id=$object->id&amp;action=edit\">".$langs->trans("Modify")."</a>";
 			}
@@ -517,7 +517,7 @@ if ($id > 0)
 	}
 	else
 	{
-		/* Charge non trouv� */
+		/* Social contribution not found */
 		dol_print_error('',$object->error);
 	}
 }

From 978dc8170dfff1a03138e7dd476a4a2c06c7a490 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Tue, 10 Mar 2015 14:56:58 +0100
Subject: [PATCH 54/93] Fix : display proposal date on proposal list

---
 htdocs/comm/propal/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index ba0a49f2772..21d774e36bb 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -388,7 +388,7 @@ if ($result)
 
 		// Date proposal
 		print '<td align="center">';
-		print dol_print_date($db->jdate($obj->dp), 'day');
+		print dol_print_date($db->jdate($objp->dp), 'day');
 		print "</td>\n";
 
 		// Date end validity

From 6113a5b0f50b87e4fc4ac3a4c09e52c12055b28d Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Tue, 10 Mar 2015 15:27:36 +0100
Subject: [PATCH 55/93] FIX : [bug #1883] missing field in SQL installation

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

diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
index f3905ab4fbe..fb5184715d1 100755
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
@@ -40,5 +40,6 @@ create table llx_product_fournisseur_price
   info_bits				integer NOT NULL DEFAULT 0,
   fk_user				integer,
   fk_supplier_price_expression	integer,                     -- Link to the rule for dynamic price calculation
-  import_key			varchar(14)                  -- Import key
+  import_key			varchar(14),                  -- Import key
+  delivery_time_days    integer
 )ENGINE=innodb;

From fa628bba6f92cae12e0e7ec7f34a050097eafedc Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Tue, 10 Mar 2015 15:34:48 +0100
Subject: [PATCH 56/93] Fix SQL error when installing

---
 htdocs/install/mysql/tables/llx_projet_task_time.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql
index d58b35146a7..6c34440a58b 100644
--- a/htdocs/install/mysql/tables/llx_projet_task_time.sql
+++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql
@@ -22,7 +22,7 @@ create table llx_projet_task_time
   fk_task          integer NOT NULL,
   task_date        date,					-- only the day
   task_datehour    datetime,				-- day + hour
-  task_date_withhour integer DEFAULT 0;	-- 0 by default, 1 if date was entered with start hour
+  task_date_withhour integer DEFAULT 0,	-- 0 by default, 1 if date was entered with start hour
   task_duration    double,
   fk_user          integer,
   thm			   double(24,8),

From 05a2a6af00f1c2a2934574d8d961fe3e27b41a7e Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Tue, 10 Mar 2015 15:53:02 +0100
Subject: [PATCH 57/93] FIX : [bug #1900] Unable to remove a salary with enough
 permissions

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

diff --git a/htdocs/compta/salaries/fiche.php b/htdocs/compta/salaries/fiche.php
index 34a2b9b4435..dac250eabc7 100644
--- a/htdocs/compta/salaries/fiche.php
+++ b/htdocs/compta/salaries/fiche.php
@@ -365,7 +365,7 @@ if ($id)
 	print "<div class=\"tabsAction\">\n";
 	if ($salpayment->rappro == 0)
 	{
-		if (! empty($user->rights->tax->charges->supprimer))
+		if (! empty($user->rights->salaries->delete))
 		{
 			print '<a class="butActionDelete" href="fiche.php?id='.$salpayment->id.'&action=delete">'.$langs->trans("Delete").'</a>';
 		}

From 0df2b4cc26cc8c76d7f5338e3a611a11a9cec037 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Mar 2015 16:14:46 +0100
Subject: [PATCH 58/93] Fix check parameters

---
 htdocs/societe/class/societe.class.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index a18aedfcc1b..dc6503646b4 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1158,12 +1158,21 @@ class Societe extends CommonObject
      * 	@param		boolean		$case		Case sensitive (true/false)
      * 	@param		boolean		$similar	Add test if string inside name into database, or name into database inside string. Do not use this: Not compatible with other database.
      * 	@param		string		$clause		Clause for filters
-     * 	@return		array		Array of thirdparties object
+     * 	@return		array|int				<0 if KO, array of thirdparties object if OK
      */
     function searchByName($name, $type='0', $filters = array(), $exact = false, $case = false, $similar = false, $clause = 'AND')
     {
     	$thirdparties = array();
 
+    	dol_syslog("searchByName name=".$name." type=".$type." exact=".$exact);
+
+    	// Check parameter
+    	if (empty($name))
+    	{
+    		$this->errors[]='ErrorBadValueForParameter';
+    		return -1;
+    	}
+
     	// Generation requete recherche
     	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
     	$sql.= " WHERE entity IN (".getEntity('category',1).")";
@@ -1242,7 +1251,7 @@ class Societe extends CommonObject
     	}
     	else
     	{
-    		$this->error=$this->db->error().' sql='.$sql;
+    		$this->error=$this->db->lasterror();
     		return -1;
     	}
     }

From 154865f545466e212e8f85f4aa34ab3ae66cb2e3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Mar 2015 16:37:39 +0100
Subject: [PATCH 59/93] Fix return error when it is not

---
 htdocs/societe/class/societe.class.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index dc6503646b4..181c9f3ec8d 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -953,7 +953,7 @@ class Societe extends CommonObject
      *    @param    string	$idprof2		Prof id 2 of third party (Warning, this can return several records)
      *    @param    string	$idprof3		Prof id 3 of third party (Warning, this can return several records)
      *    @param    string	$idprof4		Prof id 4 of third party (Warning, this can return several records)
-     *    @return   int						>0 if OK, <0 if KO or if two records found for same ref or idprof.
+     *    @return   int						>0 if OK, <0 if KO or if two records found for same ref or idprof, 0 if not found.
      */
     function fetch($rowid, $ref='', $ref_ext='', $ref_int='', $idprof1='',$idprof2='',$idprof3='',$idprof4='')
     {
@@ -1008,7 +1008,7 @@ class Societe extends CommonObject
             {
                 $this->error='Fetch several records found for ref='.$ref;
                 dol_syslog($this->error, LOG_ERR);
-                $result = -1;
+                $result = -2;
             }
             if ($num)
             {
@@ -1128,17 +1128,15 @@ class Societe extends CommonObject
                	$this->fetch_optionals($this->id,$extralabels);
             }
             else
-            {
-                $this->error='Fetch no third party found for id='.$rowid;
-                dol_syslog($this->error, LOG_ERR);
-                $result = -2;
+			{
+                $result = 0;
             }
 
             $this->db->free($resql);
         }
         else
-        {
-            $this->error=$this->db->error();
+		{
+            $this->error=$this->db->lasterror();
             $result = -3;
         }
 

From 364b1854424aacc1fcb54f12503b9220f2e9b5a3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Mar 2015 18:33:14 +0100
Subject: [PATCH 60/93] Fix sql syntax

---
 htdocs/core/class/extrafields.class.php | 88 ++++++++++++++-----------
 1 file changed, 51 insertions(+), 37 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index f1ad5d6687f..5a79c5ccf97 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -48,10 +48,12 @@ class ExtraFields
 	var $attribute_required;
 	// Array to store parameters of attribute (used in select type)
 	var $attribute_param;
-	// Int to store position of attribute
+	// Array to store position of attribute
 	var $attribute_pos;
-	// Int to store if attribute is editable regardless of the document status
+	// Array to store if attribute is editable regardless of the document status
 	var $attribute_alwayseditable;
+	// Array to store permission to check
+	var $attribute_perms;
 
 	var $error;
 	var $errno;
@@ -90,6 +92,7 @@ class ExtraFields
 		$this->attribute_elementtype = array();
 		$this->attribute_unique = array();
 		$this->attribute_required = array();
+		$this->attribute_perms = array();
 	}
 
 	/**
@@ -106,9 +109,10 @@ class ExtraFields
 	 *  @param	string	$default_value		Defaulted value
 	 *  @param  array	$param				Params for field
 	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
+	 *  @param	string	$perms				Permission to check
 	 *  @return int      					<=0 if KO, >0 if OK
 	 */
-	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param=0, $alwayseditable=0)
+	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param=0, $alwayseditable=0, $perms='')
 	{
 		if (empty($attrname)) return -1;
 		if (empty($label)) return -1;
@@ -124,7 +128,7 @@ class ExtraFields
 		if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate')
 		{
 			// Add declaration of field into table
-			$result2=$this->create_label($attrname,$label,$type,$pos,$size,$elementtype, $unique, $required, $param, $alwayseditable);
+			$result2=$this->create_label($attrname,$label,$type,$pos,$size,$elementtype, $unique, $required, $param, $alwayseditable, $perms);
 			$err2=$this->errno;
 			if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS'))
 			{
@@ -225,9 +229,10 @@ class ExtraFields
 	 *  @param	int				$required		Is field required or not
 	 *  @param  array||string	$param			Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
 	 *  @param  int				$alwayseditable	Is attribute always editable regardless of the document status
+	 *  @param	string			$perms			Permission to check
 	 *  @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='', $alwayseditable=0)
+	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='')
 	{
 		global $conf;
 
@@ -251,7 +256,7 @@ class ExtraFields
 				$params='';
 			}
 
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(name, label, type, pos, size, entity, elementtype, fieldunique, fieldrequired, param, alwayseditable)";
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(name, label, type, pos, size, entity, elementtype, fieldunique, fieldrequired, param, alwayseditable, perms)";
 			$sql.= " VALUES('".$attrname."',";
 			$sql.= " '".$this->db->escape($label)."',";
 			$sql.= " '".$type."',";
@@ -262,7 +267,8 @@ class ExtraFields
 			$sql.= " '".$unique."',";
 			$sql.= " '".$required."',";
 			$sql.= " '".$params."',";
-			$sql.= " '".$alwayseditable."'";
+			$sql.= " '".$alwayseditable."',";
+			$sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null");
 			$sql.=')';
 
 			dol_syslog(get_class($this)."::create_label", LOG_DEBUG);
@@ -363,9 +369,10 @@ class ExtraFields
 	 *  @param	int		$pos				Position of attribute
 	 *  @param  array	$param				Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
 	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
+	 *  @param	string	$perms				Permission to check
 	 * 	@return	int							>0 if OK, <=0 if KO
 	 */
-	function update($attrname,$label,$type,$length,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0)
+	function update($attrname,$label,$type,$length,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0, $perms='')
 	{
 		if ($elementtype == 'thirdparty') $elementtype='societe';
 
@@ -402,7 +409,7 @@ class ExtraFields
 			{
 				if ($label)
 				{
-					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable);
+					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms);
 				}
 				if ($result > 0)
 				{
@@ -451,12 +458,13 @@ class ExtraFields
 	 *  @param	int		$pos				Position of attribute
 	 *  @param  array	$param				Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
 	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
+	 *  @param	string	$perms				Permission to check
 	 *  @return	int							<=0 if KO, >0 if OK
 	 */
-	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0)
+	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='')
 	{
 		global $conf;
-		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required);
+		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms);
 
 		if ($elementtype == 'thirdparty') $elementtype='societe';
 
@@ -485,6 +493,7 @@ class ExtraFields
 			$sql.= " elementtype,";
 			$sql.= " fieldunique,";
 			$sql.= " fieldrequired,";
+			$sql.= " perms,";
 			$sql.= " pos,";
 			$sql.= " alwayseditable,";
 			$sql.= " param";
@@ -497,6 +506,7 @@ class ExtraFields
 			$sql.= " '".$elementtype."',";
 			$sql.= " '".$unique."',";
 			$sql.= " '".$required."',";
+			$sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
 			$sql.= " '".$pos."',";
 			$sql.= " '".$alwayseditable."',";
 			$sql.= " '".$param."'";
@@ -542,7 +552,7 @@ class ExtraFields
 		// For avoid conflicts with external modules
 		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
 
-		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable";
+		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms";
 		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
 		$sql.= " WHERE entity IN (0,".$conf->entity.")";
 		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";
@@ -571,6 +581,7 @@ class ExtraFields
 					$this->attribute_param[$tab->name]=unserialize($tab->param);
 					$this->attribute_pos[$tab->name]=$tab->pos;
 					$this->attribute_alwayseditable[$tab->name]=$tab->alwayseditable;
+					$this->attribute_perms[$tab->name]=$tab->perms;
 				}
 			}
 		}
@@ -603,6 +614,8 @@ class ExtraFields
 		$unique=$this->attribute_unique[$key];
 		$required=$this->attribute_required[$key];
 		$param=$this->attribute_param[$key];
+		$perms=$this->attribute_perms[$key];
+
 		if ($type == 'date')
 		{
 			$showsize=10;
@@ -883,7 +896,7 @@ class ExtraFields
 		elseif ($type == 'chkbxlst')
 		{
 			$value_arr = explode(',', $value);
-			
+
 			if (is_array($param['options'])) {
 				$param_list = array_keys($param['options']);
 				$InfoFieldList = explode(":", $param_list[0]);
@@ -893,7 +906,7 @@ class ExtraFields
 				// 3 : key field parent (for dependent lists)
 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
 				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');
-				
+
 				if (count($InfoFieldList) > 3 && ! empty($InfoFieldList[3])) {
 					list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);
 					$keyList .= ', ' . $parentField;
@@ -905,13 +918,13 @@ class ExtraFields
 						$keyList = $InfoFieldList[2] . ' as rowid';
 					}
 				}
-				
+
 				$fields_label = explode('|', $InfoFieldList[1]);
 				if (is_array($fields_label)) {
 					$keyList .= ', ';
 					$keyList .= implode(', ', $fields_label);
 				}
-				
+
 				$sqlwhere = '';
 				$sql = 'SELECT ' . $keyList;
 				$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
@@ -927,7 +940,7 @@ class ExtraFields
 					$sqlwhere .= ' WHERE 1';
 				}
 				if (in_array($InfoFieldList[0], array (
-						'tablewithentity' 
+						'tablewithentity'
 				)))
 					$sqlwhere .= ' AND entity = ' . $conf->entity; // Some tables may have field, some other not. For the moment we disable it.
 						                                                                                                      // $sql.=preg_replace('/^ AND /','',$sqlwhere);
@@ -941,7 +954,7 @@ class ExtraFields
 					while ( $i < $num ) {
 						$labeltoshow = '';
 						$obj = $this->db->fetch_object($resql);
-						
+
 						// Several field into label (eq table:code|libelle:rowid)
 						$fields_label = explode('|', $InfoFieldList[1]);
 						if (is_array($fields_label)) {
@@ -953,7 +966,7 @@ class ExtraFields
 							$labeltoshow = $obj->$InfoFieldList[1];
 						}
 						$labeltoshow = dol_trunc($labeltoshow, 45);
-						
+
 						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
 							foreach ( $fields_label as $field_toshow ) {
 								$translabel = $langs->trans($obj->$field_toshow);
@@ -965,9 +978,9 @@ class ExtraFields
 							}
 							$out .= '<input class="flat" type="checkbox" name="options_' . $key . $keyprefix . '[]" ' . ($moreparam ? $moreparam : '');
 							$out .= ' value="' . $obj->rowid . '"';
-							
+
 							$out .= 'checked="checked"';
-							
+
 							$out .= '/>' . $labeltoshow . '<br>';
 						} else {
 							if (! $notrans) {
@@ -980,31 +993,31 @@ class ExtraFields
 							}
 							if (empty($labeltoshow))
 								$labeltoshow = '(not defined)';
-							
+
 							if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
 								$out .= '<input class="flat" type="checkbox" name="options_' . $key . $keyprefix . '[]" ' . ($moreparam ? $moreparam : '');
 								$out .= ' value="' . $obj->rowid . '"';
-								
+
 								$out .= 'checked="checked"';
 								$out .= '';
-								
+
 								$out .= '/>' . $labeltoshow . '<br>';
 							}
-							
+
 							if (! empty($InfoFieldList[3])) {
 								$parent = $parentName . ':' . $obj->{$parentField};
 							}
-							
+
 							$out .= '<input class="flat" type="checkbox" name="options_' . $key . $keyprefix . '[]" ' . ($moreparam ? $moreparam : '');
 							$out .= ' value="' . $obj->rowid . '"';
-							
+
 							$out .= ((is_array($value_arr) && in_array($obj->rowid, $value_arr)) ? ' checked="checked" ' : '');
 							;
 							$out .= '';
-							
+
 							$out .= '/>' . $labeltoshow . '<br>';
 						}
-						
+
 						$i ++;
 					}
 					$this->db->free($resql);
@@ -1040,6 +1053,7 @@ class ExtraFields
 		$unique=$this->attribute_unique[$key];
 		$required=$this->attribute_required[$key];
 		$params=$this->attribute_param[$key];
+		$perms=$this->attribute_perms[$key];
 		if ($type == 'date')
 		{
 			$showsize=10;
@@ -1172,24 +1186,24 @@ class ExtraFields
 		elseif ($type == 'chkbxlst')
 		{
 			$value_arr = explode(',', $value);
-			
+
 			$param_list = array_keys($params['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
-			
+
 			$selectkey = "rowid";
 			$keyList = 'rowid';
-			
+
 			if (count($InfoFieldList) >= 3) {
 				$selectkey = $InfoFieldList[2];
 				$keyList = $InfoFieldList[2] . ' as rowid';
 			}
-			
+
 			$fields_label = explode('|', $InfoFieldList[1]);
 			if (is_array($fields_label)) {
 				$keyList .= ', ';
 				$keyList .= implode(', ', $fields_label);
 			}
-			
+
 			$sql = 'SELECT ' . $keyList;
 			$sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
 			if (strpos($InfoFieldList[4], 'extra') !== false) {
@@ -1197,14 +1211,14 @@ class ExtraFields
 			}
 			// $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			// $sql.= ' AND entity = '.$conf->entity;
-			
+
 			dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst',LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$value = ''; // value was used, so now we reste it to use it to build final output
-				
+
 				while ( $obj = $this->db->fetch_object($resql) ) {
-					
+
 					// Several field into label (eq table:code|libelle:rowid)
 					$fields_label = explode('|', $InfoFieldList[1]);
 					if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {

From 548e720ca2c76b45417f27ca990ebe46d5615499 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Mar 2015 19:31:04 +0100
Subject: [PATCH 61/93] Uniformize code

---
 htdocs/comm/propal.php                   | 17 ++++++++---------
 htdocs/core/tpl/extrafields_view.tpl.php |  2 +-
 htdocs/fourn/commande/card.php           | 22 +++++++++++-----------
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 98f662e3d5d..4a45f724f01 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -2003,8 +2003,7 @@ if ($action == 'create')
 
 	// Amount HT
 	print '<tr><td height="10" width="25%">' . $langs->trans('AmountHT') . '</td>';
-	print '<td align="right" class="nowrap"><b>' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . '</b></td>';
-	print '<td></td>';
+	print '<td align="right" class="nowrap" colspan="2"><b>' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . '</b></td>';
 
 	// Margin Infos
 	if (! empty($conf->margin->enabled)) {
@@ -2016,27 +2015,27 @@ if ($action == 'create')
 
 	// Amount VAT
 	print '<tr><td height="10">' . $langs->trans('AmountVAT') . '</td>';
-	print '<td align="right" class="nowrap">' . price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
-	print '<td></td></tr>';
+	print '<td align="right" class="nowrap" colspan="2">' . price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
+	print '</tr>';
 
 	// Amount Local Taxes
 	if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) 	// Localtax1
 	{
 		print '<tr><td height="10">' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
-		print '<td align="right" class="nowrap">' . price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
+		print '<td align="right" class="nowrap" colspan="2">' . price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
 		print '<td></td></tr>';
 	}
 	if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) 	// Localtax2
 	{
 		print '<tr><td height="10">' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
-		print '<td align="right" class="nowrap">' . price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
-		print '<td></td></tr>';
+		print '<td align="right" class="nowrap" colspan="2">' . price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
+		print '</tr>';
 	}
 
 	// Amount TTC
 	print '<tr><td height="10">' . $langs->trans('AmountTTC') . '</td>';
-	print '<td align="right" class="nowrap">' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
-	print '<td></td></tr>';
+	print '<td align="right" class="nowrap" colspan="2">' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . '</td>';
+	print '</tr>';
 
 	// Statut
 	print '<tr><td height="10">' . $langs->trans('Status') . '</td><td align="left" colspan="2">' . $object->getLibStatut(4) . '</td></tr>';
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 7f0115b83bc..b6b26cc380d 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -65,7 +65,7 @@ if (empty($reshook) && ! empty($extrafields->attribute_label))
 				print '<td align="right"><a href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=edit_extras&attribute=' . $key . '">' . img_edit().'</a></td>';
 
 			print '</tr></table>';
-			print '<td colspan="5">';
+			print '<td colspan="'.$cols.'">';
 
 			// Convert date into timestamp format
 			if (in_array($extrafields->attribute_type[$key], array('date','datetime'))) {
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 6101aa7e17d..41d06bebf43 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1947,28 +1947,28 @@ elseif (! empty($object->id))
 
 	// Ligne de	3 colonnes
 	print '<tr><td>'.$langs->trans("AmountHT").'</td>';
-	print '<td align="right"><b>'.price($object->total_ht).'</b></td>';
-	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+	print '<td colspan="2">'.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).'</td>';
+	print '</tr>';
 
-	print '<tr><td>'.$langs->trans("AmountVAT").'</td><td align="right">'.price($object->total_tva).'</td>';
-	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+	print '<tr><td>'.$langs->trans("AmountVAT").'</td><td colspan="2">'.price($object->total_tva,'',$langs,1,-1,-1,$conf->currency).'</td>';
+	print '</tr>';
 
 	// Amount Local Taxes
 	if ($mysoc->localtax1_assuj=="1" || $object->total_localtax1 != 0) //Localtax1
 	{
 		print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->country_code).'</td>';
-		print '<td align="right">'.price($object->total_localtax1).'</td>';
-		print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+		print '<td colspan="2">'.price($object->total_localtax1,'',$langs,1,-1,-1,$conf->currency).'</td>';
+		print '</tr>';
 	}
 	if ($mysoc->localtax2_assuj=="1" || $object->total_localtax2 != 0) //Localtax2
 	{
 		print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->country_code).'</td>';
-		print '<td align="right">'.price($object->total_localtax2).'</td>';
-		print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+		print '<td colspan="2">'.price($object->total_localtax2,'',$langs,1,-1,-1,$conf->currency).'</td>';
+		print '</tr>';
 	}
 
-	print '<tr><td>'.$langs->trans("AmountTTC").'</td><td align="right">'.price($object->total_ttc).'</td>';
-	print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>';
+	print '<tr><td>'.$langs->trans("AmountTTC").'</td><td colspan="2">'.price($object->total_ttc,'',$langs,1,-1,-1,$conf->currency).'</td>';
+	print '</tr>';
 
 	print "</table><br>";
 
@@ -2610,7 +2610,7 @@ elseif (! empty($object->id))
 						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
 					}
 				}
-				
+
 				// Create bill
 				if (! empty($conf->fournisseur->enabled) && $object->statut >= 2)  // 2 means accepted
 				{

From c27125745282002d91b08f82b25229d37d5db17b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 10 Mar 2015 22:27:16 +0100
Subject: [PATCH 62/93] Prepare extrafield for option by default into lists

---
 htdocs/core/class/extrafields.class.php       | 46 +++++++++++++------
 .../install/mysql/migration/3.7.0-3.8.0.sql   |  1 +
 .../install/mysql/tables/llx_extrafields.sql  |  3 +-
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 5a79c5ccf97..24d8c40f5b3 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -54,6 +54,8 @@ class ExtraFields
 	var $attribute_alwayseditable;
 	// Array to store permission to check
 	var $attribute_perms;
+	// Array to store permission to check
+	var $attribute_list;
 
 	var $error;
 	var $errno;
@@ -93,6 +95,7 @@ class ExtraFields
 		$this->attribute_unique = array();
 		$this->attribute_required = array();
 		$this->attribute_perms = array();
+		$this->attribute_list = array();
 	}
 
 	/**
@@ -110,9 +113,10 @@ class ExtraFields
 	 *  @param  array	$param				Params for field
 	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
 	 *  @param	string	$perms				Permission to check
+	 *  @param	int		$list				Into list view by default
 	 *  @return int      					<=0 if KO, >0 if OK
 	 */
-	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param=0, $alwayseditable=0, $perms='')
+	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param=0, $alwayseditable=0, $perms='', $list=0)
 	{
 		if (empty($attrname)) return -1;
 		if (empty($label)) return -1;
@@ -122,13 +126,13 @@ class ExtraFields
 		// Create field into database except for separator type which is not stored in database
 		if ($type != 'separate')
 		{
-			$result=$this->create($attrname,$type,$size,$elementtype, $unique, $required, $default_value,$param);
+			$result=$this->create($attrname,$type,$size,$elementtype, $unique, $required, $default_value, $param, $perms, $list);
 		}
 		$err1=$this->errno;
 		if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate')
 		{
 			// Add declaration of field into table
-			$result2=$this->create_label($attrname,$label,$type,$pos,$size,$elementtype, $unique, $required, $param, $alwayseditable, $perms);
+			$result2=$this->create_label($attrname,$label,$type,$pos,$size,$elementtype, $unique, $required, $param, $alwayseditable, $perms, $list);
 			$err2=$this->errno;
 			if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS'))
 			{
@@ -156,10 +160,11 @@ class ExtraFields
 	 *  @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'))
-	 *
+	 *  @param	string	$perms				Permission
+	 *	@param	int		$list				Into list view by default
 	 *  @return int      	           		<=0 if KO, >0 if OK
 	 */
-	private function create($attrname, $type='varchar', $length=255, $elementtype='member', $unique=0, $required=0, $default_value='',$param='')
+	private function create($attrname, $type='varchar', $length=255, $elementtype='member', $unique=0, $required=0, $default_value='',$param='', $perms='', $list=0)
 	{
 		if ($elementtype == 'thirdparty') $elementtype='societe';
 
@@ -230,9 +235,10 @@ class ExtraFields
 	 *  @param  array||string	$param			Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
 	 *  @param  int				$alwayseditable	Is attribute always editable regardless of the document status
 	 *  @param	string			$perms			Permission to check
+	 *  @param	int				$list			Into list view by default
 	 *  @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='', $alwayseditable=0, $perms='')
+	private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list=0)
 	{
 		global $conf;
 
@@ -240,6 +246,7 @@ class ExtraFields
 
 		// Clean parameters
 		if (empty($pos)) $pos=0;
+		if (empty($list)) $list=0;
 
 		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname) && ! is_numeric($attrname))
 		{
@@ -256,7 +263,7 @@ class ExtraFields
 				$params='';
 			}
 
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(name, label, type, pos, size, entity, elementtype, fieldunique, fieldrequired, param, alwayseditable, perms)";
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(name, label, type, pos, size, entity, elementtype, fieldunique, fieldrequired, param, alwayseditable, perms, list)";
 			$sql.= " VALUES('".$attrname."',";
 			$sql.= " '".$this->db->escape($label)."',";
 			$sql.= " '".$type."',";
@@ -268,7 +275,8 @@ class ExtraFields
 			$sql.= " '".$required."',";
 			$sql.= " '".$params."',";
 			$sql.= " '".$alwayseditable."',";
-			$sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null");
+			$sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").",";
+			$sql.= " ".$list;
 			$sql.=')';
 
 			dol_syslog(get_class($this)."::create_label", LOG_DEBUG);
@@ -370,9 +378,10 @@ class ExtraFields
 	 *  @param  array	$param				Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
 	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
 	 *  @param	string	$perms				Permission to check
+	 *  @param	int		$list				Into list view by default
 	 * 	@return	int							>0 if OK, <=0 if KO
 	 */
-	function update($attrname,$label,$type,$length,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0, $perms='')
+	function update($attrname,$label,$type,$length,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0, $perms='',$list='')
 	{
 		if ($elementtype == 'thirdparty') $elementtype='societe';
 
@@ -409,7 +418,7 @@ class ExtraFields
 			{
 				if ($label)
 				{
-					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms);
+					$result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms,$list);
 				}
 				if ($result > 0)
 				{
@@ -459,14 +468,17 @@ class ExtraFields
 	 *  @param  array	$param				Params for field  (ex for select list : array('options' => array(value'=>'label of option')) )
 	 *  @param  int		$alwayseditable		Is attribute always editable regardless of the document status
 	 *  @param	string	$perms				Permission to check
+	 *  @param	int		$list				Into list view by default
 	 *  @return	int							<=0 if KO, >0 if OK
 	 */
-	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='')
+	private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list=0)
 	{
 		global $conf;
-		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms);
+		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list);
 
+		// Clean parameters
 		if ($elementtype == 'thirdparty') $elementtype='societe';
+		if (empty($list)) $list=0;
 
 		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
 		{
@@ -496,7 +508,8 @@ class ExtraFields
 			$sql.= " perms,";
 			$sql.= " pos,";
 			$sql.= " alwayseditable,";
-			$sql.= " param";
+			$sql.= " param,";
+			$sql.= " list";
 			$sql.= ") VALUES (";
 			$sql.= "'".$attrname."',";
 			$sql.= " ".$conf->entity.",";
@@ -510,6 +523,7 @@ class ExtraFields
 			$sql.= " '".$pos."',";
 			$sql.= " '".$alwayseditable."',";
 			$sql.= " '".$param."'";
+			$sql.= " ".$list;
 			$sql.= ")";
 			dol_syslog(get_class($this)."::update_label", LOG_DEBUG);
 			$resql2=$this->db->query($sql);
@@ -552,7 +566,7 @@ class ExtraFields
 		// For avoid conflicts with external modules
 		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
 
-		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms";
+		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,list";
 		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
 		$sql.= " WHERE entity IN (0,".$conf->entity.")";
 		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";
@@ -582,6 +596,7 @@ class ExtraFields
 					$this->attribute_pos[$tab->name]=$tab->pos;
 					$this->attribute_alwayseditable[$tab->name]=$tab->alwayseditable;
 					$this->attribute_perms[$tab->name]=$tab->perms;
+					$this->attribute_perms[$tab->name]=$tab->list;
 				}
 			}
 		}
@@ -615,6 +630,7 @@ class ExtraFields
 		$required=$this->attribute_required[$key];
 		$param=$this->attribute_param[$key];
 		$perms=$this->attribute_perms[$key];
+		$list=$this->attribute_list[$key];
 
 		if ($type == 'date')
 		{
@@ -1054,6 +1070,8 @@ class ExtraFields
 		$required=$this->attribute_required[$key];
 		$params=$this->attribute_param[$key];
 		$perms=$this->attribute_perms[$key];
+		$list=$this->attribute_list[$key];
+
 		if ($type == 'date')
 		{
 			$showsize=10;
diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index 03736b088fc..6d767e20d45 100755
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -20,6 +20,7 @@
 
 
 ALTER TABLE llx_extrafields ADD COLUMN perms varchar(255) after fieldrequired;
+ALTER TABLE llx_extrafields ADD COLUMN list integer DEFAULT 0 after perms;
 
 ALTER TABLE llx_payment_salary ADD COLUMN salary real after datev;
 
diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql
index 11271125508..21610d07c0e 100644
--- a/htdocs/install/mysql/tables/llx_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_extrafields.sql
@@ -32,5 +32,6 @@ create table llx_extrafields
 	perms			varchar(255),
 	pos             integer DEFAULT 0,
 	alwayseditable  integer DEFAULT 0,
-	param		text
+	param			text,
+	list			integer DEFAULT 0
 )ENGINE=innodb;

From ec322e2e2974d52f767d4132bb1878e6685ded55 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Mar 2015 03:03:17 +0100
Subject: [PATCH 63/93] Revert was not complete

---
 htdocs/admin/system/database-tables.php |  5 +-
 htdocs/core/db/sqlite.class.php         | 84 +++----------------------
 htdocs/core/db/sqlite3.class.php        |  3 +-
 htdocs/install/etape2.php               |  3 +-
 htdocs/install/fileconf.php             |  3 +-
 5 files changed, 17 insertions(+), 81 deletions(-)

diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index e75cec3f513..39b3dd4cad5 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -66,7 +66,8 @@ else if ($conf->db->type == 'mssql')
 	//$sqls[0] = "";
 	//$base=3;
 }
-else if ($conf->db->type == 'sqlite3') {
+else if ($conf->db->type == 'sqlite' || $conf->db->type == 'sqlite3')
+{
 	//$sql = "SELECT name, type FROM sqlite_master";
 	$base = 4;
 }
@@ -176,7 +177,7 @@ else
 
 	if ($base == 4)
 	{
-		// Sqlite3
+		// Sqlite by PDO or by Sqlite3
 		print '<table class="noborder">';
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("TableName").'</td>';
diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php
index 786bf435fcf..88efde86394 100644
--- a/htdocs/core/db/sqlite.class.php
+++ b/htdocs/core/db/sqlite.class.php
@@ -40,12 +40,6 @@ class DoliDBSqlite extends DoliDB
 	//! Resultset of last query
 	private $_results;
 
-	/**
-	 * Indique que les fonctions personnalisées sont définies
-	 * @var boolean
-	 */
-	private static $customFunctionsDefined = false;
-
     /**
 	 *	Constructor.
 	 *	This create an opened connexion to a database server and eventually to a database
@@ -56,6 +50,7 @@ class DoliDBSqlite extends DoliDB
 	 *	@param	    string	$pass		Mot de passe
 	 *	@param	    string	$name		Nom de la database
 	 *	@param	    int		$port		Port of database server
+	 *	@return	    int					1 if OK, 0 if not
      */
     function __construct($type, $host, $user, $pass, $name='', $port=0)
     {
@@ -159,7 +154,7 @@ class DoliDBSqlite extends DoliDB
 
     			// Process case: "CREATE TABLE llx_mytable(rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,code..."
     			if (preg_match('/[\s\t\(]*(\w*)[\s\t]+int.*auto_increment/i',$line,$reg)) {
-    				$newline=preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i','\\1 \\2 integer PRIMARY KEY AUTOINCREMENT',$line);
+    				$newline=preg_replace('/([\s\t\(]*)([a-zA-Z_0-9]*)[\s\t]+int.*auto_increment[^,]*/i','\\1 \\2 SERIAL PRIMARY KEY',$line);
                     //$line = "-- ".$line." replaced by --\n".$newline;
                     $line=$newline;
     			}
@@ -248,18 +243,11 @@ class DoliDBSqlite extends DoliDB
     				$line = "-- ".$line." replaced by --\n";
     				$line.= "CREATE ".(preg_match('/UNIQUE/',$reg[2])?'UNIQUE ':'')."INDEX ".$idxname." ON ".$tablename." (".$fieldlist.")";
     			}
-				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i',$line, $reg)) {
-					// Pour l'instant les contraintes ne sont pas créées
-					dol_syslog(get_class().'::query line emptied');
-					$line = 'SELECT 0;';
-
-				}
-
-				//if (preg_match('/rowid\s+.*\s+PRIMARY\s+KEY,/i', $line)) {
-					//preg_replace('/(rowid\s+.*\s+PRIMARY\s+KEY\s*,)/i', '/* \\1 */', $line);
-				//}
             }
 
+            // To have postgresql case sensitive
+            $line=str_replace(' LIKE \'',' ILIKE \'',$line);
+
 			// Delete using criteria on other table must not declare twice the deleted table
 			// DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable
 			if (preg_match('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i',$line,$reg))
@@ -400,53 +388,7 @@ class DoliDBSqlite extends DoliDB
         $this->error = 0;
 
 		// Convert MySQL syntax to SQLite syntax
-		if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*\(([\w,\s]+)\)\s*REFERENCES\s+(\w+)\s*\(([\w,\s]+)\)/i',$query, $reg)) {
-			// Ajout d'une clef étrangère à la table
-			// procédure de remplacement de la table pour ajouter la contrainte
-			// Exemple : ALTER TABLE llx_adherent ADD CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid)
-			// -> CREATE TABLE ( ... ,CONSTRAINT adherent_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid))
-			$foreignFields = $reg[5];
-			$foreignTable = $reg[4];
-			$localfields = $reg[3];
-			$constraintname=trim($reg[2]);
-			$tablename=trim($reg[1]);
-
-			$res = $this->db->query("SELECT sql FROM sqlite_master WHERE name='" . $tablename . "'");
-			$descTable = $res->fetchColumn();
-			$res->closeCursor();
-
-			// 1- Renommer la table avec un nom temporaire
-			$res = $this->query('ALTER TABLE ' . $tablename . ' RENAME TO tmp_' . $tablename);
-			$res->closeCursor();
-
-			// 2- Recréer la table avec la contrainte ajoutée
-
-			// on bricole la requete pour ajouter la contrainte
-			$descTable = substr($descTable, 0, strlen($descTable) - 1);
-			$descTable .= ", CONSTRAINT " . $constraintname . " FOREIGN KEY (" . $localfields . ") REFERENCES " .$foreignTable . "(" . $foreignFields . ")";
-
-			// fermeture de l'instruction
-			$descTable .= ')';
-
-			// Création proprement dite de la table
-			$res = $this->query($descTable);
-			$res->closeCursor();
-
-			// 3- Transférer les données
-			$res = $this->query('INSERT INTO ' . $tablename . ' SELECT * FROM tmp_' . $tablename);
-			$res->closeCursor();
-
-
-			// 4- Supprimer la table temporaire
-			$res = $this->query('DROP TABLE tmp_' . $tablename);
-			$res->closeCursor();
-
-			// dummy statement
-			$query="SELECT 0";
-
-		} else {
-			$query=$this->convertSQLFromMysql($query,$type);
-		}
+		$query=$this->convertSQLFromMysql($query,$type);
 		//print "After convertSQLFromMysql:\n".$query."<br>\n";
 
 	    dol_syslog('sql='.$query, LOG_DEBUG);
@@ -546,11 +488,7 @@ class DoliDBSqlite extends DoliDB
     {
         // If resultset not provided, we take the last used by connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
-		if (preg_match("/^SELECT/i", $resultset->queryString)) {
-			$res = $this->db->query("SELECT count(*) FROM (" . $resultset->queryString . ") q");
-			return $res->fetchColumn();
-		}
-		return $resultset->rowCount();
+        return $resultset->rowCount();
     }
 
     /**
@@ -592,12 +530,7 @@ class DoliDBSqlite extends DoliDB
 	 */
     function escape($stringtoencode)
     {
-		$ret = $this->db->quote($stringtoencode);
-		$l = strlen($ret);
-		if ($l >= 2) {
-			return substr($ret, 1, $l -2);
-		}
-		return '';
+        return $this->db->quote($stringtoencode);
     }
 
     /**
@@ -1203,6 +1136,5 @@ class DoliDBSqlite extends DoliDB
 
         return $result;
     }
-
 }
 
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index c52578fa579..ce3762202e4 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -354,7 +354,8 @@ class DoliDBSqlite3 extends DoliDB
      */
     function getVersion()
     {
-        return $this->db->version()['versionString'];
+    	$tmp=$this->db->version();
+        return $tmp['versionString'];
     }
 
     /**
diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php
index 612c3c64148..8c0e3f8ab5c 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/etape2.php
@@ -51,7 +51,8 @@ if ($dolibarr_main_db_type == "mysql")  $choix=1;
 if ($dolibarr_main_db_type == "mysqli") $choix=1;
 if ($dolibarr_main_db_type == "pgsql")  $choix=2;
 if ($dolibarr_main_db_type == "mssql")  $choix=3;
-if ($dolibarr_main_db_type == "sqlite3")  $choix=4;
+if ($dolibarr_main_db_type == "sqlite")  $choix=4;
+if ($dolibarr_main_db_type == "sqlite3")  $choix=5;
 
 //if (empty($choix)) dol_print_error('','Database type '.$dolibarr_main_db_type.' not supported into etape2.php page');
 
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index ec3e208374b..5dce328d04c 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -306,7 +306,7 @@ if (! empty($force_install_message))
                     $class='DoliDB'.ucfirst($type);
                     include_once $dir."/".$file;
 
-                    if ($type == 'sqlite') continue;    // We hide sqlite because support can't be complete unti sqlit does not manage foreign key creation after table creation
+                    if ($type == 'sqlite') continue;    // We hide sqlite because support can't be complete until sqlite does not manage foreign key creation after table creation
 
 		            // Version min of database
                     $versionbasemin=explode('.',$class::VERSIONMIN);
@@ -320,6 +320,7 @@ if (! empty($force_install_message))
 		            if ($type=='mysqli') { $testfunction='mysqli_connect'; $testclass=''; }
 		            if ($type=='pgsql')  { $testfunction='pg_connect'; $testclass=''; }
 		            if ($type=='mssql')  { $testfunction='mssql_connect'; $testclass=''; }
+		        	if ($type=='sqlite') { $testfunction=''; $testclass='PDO'; }
 		            if ($type=='sqlite3') { $testfunction=''; $testclass='SQLite3'; }
 		            $option.='<option value="'.$type.'"'.($defaultype == $type?' selected="selected"':'');
 		            if ($testfunction && ! function_exists($testfunction)) $option.=' disabled="disabled"';

From e2e95b5f8cf2e581c975579274797db55e18f6fc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <ephpcsdy@destailleur.fr>
Date: Wed, 11 Mar 2015 03:58:57 +0100
Subject: [PATCH 64/93] phpcs

---
 htdocs/core/class/dolgraph.class.php | 106 +++++++++++++--------------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 5451d7457ce..d783445f276 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -65,7 +65,7 @@ class DolGraph
 	var $bgcolorgrid=array(255,255,255);			// array(R,G,B)
 	var $datacolor;				// array(array(R,G,B),...)
 
-	protected $_stringtoshow;      // To store string to output graph into HTML page
+	protected $stringtoshow;      // To store string to output graph into HTML page
 
 
 	/**
@@ -774,7 +774,7 @@ class DolGraph
 		// Generate file
 		$graph->draw($file);
 
-		$this->_stringtoshow='<!-- Build using '.$this->_library.' --><img src="'.$fileurl.'" title="'.dol_escape_htmltag($this->title?$this->title:$this->YLabel).'" alt="'.dol_escape_htmltag($this->title?$this->title:$this->YLabel).'">';
+		$this->stringtoshow='<!-- Build using '.$this->_library.' --><img src="'.$fileurl.'" title="'.dol_escape_htmltag($this->title?$this->title:$this->YLabel).'" alt="'.dol_escape_htmltag($this->title?$this->title:$this->YLabel).'">';
 	}
 
 
@@ -847,18 +847,18 @@ class DolGraph
 		}
 		$tag=dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file),'_',array('-','.'))));
 
-		$this->_stringtoshow ='<!-- Build using '.$this->_library.' -->'."\n";
-		if (! empty($this->title)) $this->_stringtoshow.='<div align="center" class="dolgraphtitle'.(empty($this->cssprefix)?'':' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';
-		$this->_stringtoshow.='<div id="placeholder_'.$tag.'" style="width:'.$this->width.'px;height:'.$this->height.'px;" class="dolgraph'.(empty($this->cssprefix)?'':' dolgraph'.$this->cssprefix).'"></div>'."\n";
-		$this->_stringtoshow.='<script id="'.$tag.'">'."\n";
-		$this->_stringtoshow.='$(function () {'."\n";
+		$this->stringtoshow ='<!-- Build using '.$this->_library.' -->'."\n";
+		if (! empty($this->title)) $this->stringtoshow.='<div align="center" class="dolgraphtitle'.(empty($this->cssprefix)?'':' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';
+		$this->stringtoshow.='<div id="placeholder_'.$tag.'" style="width:'.$this->width.'px;height:'.$this->height.'px;" class="dolgraph'.(empty($this->cssprefix)?'':' dolgraph'.$this->cssprefix).'"></div>'."\n";
+		$this->stringtoshow.='<script id="'.$tag.'">'."\n";
+		$this->stringtoshow.='$(function () {'."\n";
 		$i=$firstlot;
 		while ($i < $nblot)
 		{
-			$this->_stringtoshow.=$serie[$i];
+			$this->stringtoshow.=$serie[$i];
 			$i++;
 		}
-		$this->_stringtoshow.="\n";
+		$this->stringtoshow.="\n";
 
 		// Special case for Graph of type 'pie'
 		if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'pie')
@@ -871,7 +871,7 @@ class DolGraph
 			$showpointvalue=$this->showpointvalue;
 			$showpercent=$this->showpercent;
 
-			$this->_stringtoshow.= '
+			$this->stringtoshow.= '
 			function plotWithOptions_'.$tag.'() {
 			$.plot($("#placeholder_'.$tag.'"), d0,
 			{
@@ -886,15 +886,15 @@ class DolGraph
 			var percent=Math.round(series.percent);
 			var number=series.data[0][1];
 			return \'';
-			$this->_stringtoshow.='<div style="font-size:8pt;text-align:center;padding:2px;color:white;">';
-			if ($urltemp) $this->_stringtoshow.='<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';
-			$this->_stringtoshow.='\'+';
-			$this->_stringtoshow.=($showlegend?'':'label+\'<br/>\'+');	// Hide label if already shown in legend
-			$this->_stringtoshow.=($showpointvalue?'number+':'');
-			$this->_stringtoshow.=($showpercent?'\'<br/>\'+percent+\'%\'+':'');
-			$this->_stringtoshow.='\'';
-			if ($urltemp) $this->_stringtoshow.='</a>';
-			$this->_stringtoshow.='</div>\';
+			$this->stringtoshow.='<div style="font-size:8pt;text-align:center;padding:2px;color:white;">';
+			if ($urltemp) $this->stringtoshow.='<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';
+			$this->stringtoshow.='\'+';
+			$this->stringtoshow.=($showlegend?'':'label+\'<br/>\'+');	// Hide label if already shown in legend
+			$this->stringtoshow.=($showpointvalue?'number+':'');
+			$this->stringtoshow.=($showpercent?'\'<br/>\'+percent+\'%\'+':'');
+			$this->stringtoshow.='\'';
+			if ($urltemp) $this->stringtoshow.='</a>';
+			$this->stringtoshow.='</div>\';
 			},
 			background: {
 			opacity: 0.5,
@@ -911,9 +911,9 @@ class DolGraph
 			},';
 			if (count($datacolor))
 			{
-				$this->_stringtoshow.='colors: '.(! empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor)).',';
+				$this->stringtoshow.='colors: '.(! empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor)).',';
 			}
-			$this->_stringtoshow.='legend: {show: '.($showlegend?'true':'false').', position: \'ne\' }
+			$this->stringtoshow.='legend: {show: '.($showlegend?'true':'false').', position: \'ne\' }
 		});
 		}'."\n";
 		}
@@ -921,7 +921,7 @@ class DolGraph
 		else
 		{
 			// Add code to support tooltips
-			$this->_stringtoshow.='
+			$this->stringtoshow.='
 			function showTooltip_'.$tag.'(x, y, contents) {
 				$(\'<div id="tooltip_'.$tag.'">\' + contents + \'</div>\').css({
 					position: \'absolute\',
@@ -935,26 +935,26 @@ class DolGraph
 					opacity: 0.80
 				}).appendTo("body").fadeIn(20);
 			}
-	
+
 			var previousPoint = null;
 			$("#placeholder_'.$tag.'").bind("plothover", function (event, pos, item) {
 				$("#x").text(pos.x.toFixed(2));
 				$("#y").text(pos.y.toFixed(2));
-		
+
 				if (item) {
 					if (previousPoint != item.dataIndex) {
 						previousPoint = item.dataIndex;
-				
+
 						$("#tooltip").remove();
 						/* console.log(item); */
 						var x = item.datapoint[0].toFixed(2);
 						var y = item.datapoint[1].toFixed(2);
 						var z = item.series.xaxis.ticks[item.dataIndex].label;
 						';
-						if ($this->showpointvalue > 0) $this->_stringtoshow.='
+						if ($this->showpointvalue > 0) $this->stringtoshow.='
 							showTooltip_'.$tag.'(item.pageX, item.pageY, item.series.label + "<br>" + z + " => " + y);
 						';
-						$this->_stringtoshow.='
+						$this->stringtoshow.='
 					}
 				}
 				else {
@@ -964,50 +964,50 @@ class DolGraph
 			});
 			';
 
-			$this->_stringtoshow.='var stack = null, steps = false;'."\n";
+			$this->stringtoshow.='var stack = null, steps = false;'."\n";
 
-			$this->_stringtoshow.='function plotWithOptions_'.$tag.'() {'."\n";
-			$this->_stringtoshow.='$.plot($("#placeholder_'.$tag.'"), [ '."\n";
+			$this->stringtoshow.='function plotWithOptions_'.$tag.'() {'."\n";
+			$this->stringtoshow.='$.plot($("#placeholder_'.$tag.'"), [ '."\n";
 			$i=$firstlot;
 			while ($i < $nblot)
 			{
-				if ($i > $firstlot) $this->_stringtoshow.=', '."\n";
+				if ($i > $firstlot) $this->stringtoshow.=', '."\n";
 				$color=sprintf("%02x%02x%02x",$this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
-				$this->_stringtoshow.='{ ';
-				if (! isset($this->type[$i]) || $this->type[$i] == 'bars') $this->_stringtoshow.='bars: { show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
-				if (isset($this->type[$i]) && $this->type[$i] == 'lines')  $this->_stringtoshow.='lines: { show: true, fill: false }, ';
-				$this->_stringtoshow.='color: "#'.$color.'", label: "'.(isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '').'", data: d'.$i.' }';
+				$this->stringtoshow.='{ ';
+				if (! isset($this->type[$i]) || $this->type[$i] == 'bars') $this->stringtoshow.='bars: { show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
+				if (isset($this->type[$i]) && $this->type[$i] == 'lines')  $this->stringtoshow.='lines: { show: true, fill: false }, ';
+				$this->stringtoshow.='color: "#'.$color.'", label: "'.(isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '').'", data: d'.$i.' }';
 				$i++;
 			}
-			$this->_stringtoshow.="\n".' ], { series: { stack: stack, lines: { fill: false, steps: steps }, bars: { barWidth: 0.6 } }'."\n";
+			$this->stringtoshow.="\n".' ], { series: { stack: stack, lines: { fill: false, steps: steps }, bars: { barWidth: 0.6 } }'."\n";
 
 			// Xaxis
-			$this->_stringtoshow.=', xaxis: { ticks: ['."\n";
+			$this->stringtoshow.=', xaxis: { ticks: ['."\n";
 			$x=0;
 			foreach($this->data as $key => $valarray)
 			{
-				if ($x > 0) $this->_stringtoshow.=', '."\n";
-				$this->_stringtoshow.= ' ['.$x.', "'.$valarray[0].'"]';
+				if ($x > 0) $this->stringtoshow.=', '."\n";
+				$this->stringtoshow.= ' ['.$x.', "'.$valarray[0].'"]';
 				$x++;
 			}
-			$this->_stringtoshow.='] }'."\n";
+			$this->stringtoshow.='] }'."\n";
 
 			// Yaxis
-			$this->_stringtoshow.=', yaxis: { min: '.$this->MinValue.', max: '.($this->MaxValue).' }'."\n";
+			$this->stringtoshow.=', yaxis: { min: '.$this->MinValue.', max: '.($this->MaxValue).' }'."\n";
 
 			// Background color
 			$color1=sprintf("%02x%02x%02x",$this->bgcolorgrid[0],$this->bgcolorgrid[0],$this->bgcolorgrid[2]);
 			$color2=sprintf("%02x%02x%02x",$this->bgcolorgrid[0],$this->bgcolorgrid[1],$this->bgcolorgrid[2]);
-			$this->_stringtoshow.=', grid: { hoverable: true, backgroundColor: { colors: ["#'.$color1.'", "#'.$color2.'"] } }'."\n";
-			//$this->_stringtoshow.=', shadowSize: 20'."\n";    TODO Uncommet this
-			$this->_stringtoshow.='});'."\n";
-			$this->_stringtoshow.='}'."\n";
+			$this->stringtoshow.=', grid: { hoverable: true, backgroundColor: { colors: ["#'.$color1.'", "#'.$color2.'"] } }'."\n";
+			//$this->stringtoshow.=', shadowSize: 20'."\n";    TODO Uncommet this
+			$this->stringtoshow.='});'."\n";
+			$this->stringtoshow.='}'."\n";
 
 		}
 
-		$this->_stringtoshow.='plotWithOptions_'.$tag.'();'."\n";
-		$this->_stringtoshow.='});'."\n";
-		$this->_stringtoshow.='</script>'."\n";
+		$this->stringtoshow.='plotWithOptions_'.$tag.'();'."\n";
+		$this->stringtoshow.='});'."\n";
+		$this->stringtoshow.='</script>'."\n";
 	}
 
 
@@ -1019,10 +1019,10 @@ class DolGraph
 	 */
 	function show()
 	{
-		return $this->_stringtoshow;
+		return $this->stringtoshow;
 	}
 
-	
+
 	/**
 	 * getDefaultGraphSizeForStats
 	 *
@@ -1033,18 +1033,18 @@ class DolGraph
 	static function getDefaultGraphSizeForStats($direction,$defaultsize='')
 	{
 		global $conf;
-	
+
 		if ($direction == 'width')
 		{
 			if (empty($conf->dol_optimize_smallscreen)) return ($defaultsize ? $defaultsize : '500');
 			else return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width']-40));
 		}
-		if ($direction == 'height') 
+		if ($direction == 'height')
 		{
 			return (empty($conf->dol_optimize_smallscreen)?($defaultsize?$defaultsize:'200'):'160');
 		}
 		return 0;
 	}
-	
+
 }
 

From 958667ada041ce40d5410b222e9f6f7a70f9e64e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Mar 2015 12:33:34 +0100
Subject: [PATCH 65/93] Fix phpcs

---
 htdocs/core/db/sqlite3.class.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index 3c95d9f73f7..50d9e5c9c79 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -1255,11 +1255,14 @@ class DoliDBSqlite3 extends DoliDB
      * @param	int		$arg_count		Arg count
      * @return	void
      */
-    private function addCustomFunction($name, $arg_count = -1) {
-        if ($this->db) {
-            $localname = __CLASS__ . '::' . 'db' . $name;
+    private function addCustomFunction($name, $arg_count = -1)
+    {
+        if ($this->db)
+        {
+        	$newname=preg_replace('/_/','',$name);
+            $localname = __CLASS__ . '::' . 'db' . $newname;
             $reflectClass = new ReflectionClass(__CLASS__);
-            $reflectFunction = $reflectClass->getMethod('db' . $name);
+            $reflectFunction = $reflectClass->getMethod('db' . $newname);
             if ($arg_count < 0) {
                 $arg_count = $reflectFunction->getNumberOfParameters();
             }
@@ -1333,7 +1336,7 @@ class DoliDBSqlite3 extends DoliDB
      * @param 	string $format 	la chaine de formatage
      * @return 	string 			La date formatee.
      */
-    public static function dbdate_format($date, $format)
+    public static function dbdateformat($date, $format)
     {
         static $mysql_replacement;
         if (! isset($mysql_replacement)) {

From e8e2f65ae5a58d461e0465edd55b83d01a0a4da8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 11 Mar 2015 14:55:45 +0100
Subject: [PATCH 66/93] Debug virtual product interface

---
 htdocs/comm/propal.php                   |  15 +-
 htdocs/core/class/commonobject.class.php |  11 +-
 htdocs/product/card.php                  |   3 +-
 htdocs/product/class/product.class.php   |  48 ++++---
 htdocs/product/composition/card.php      | 166 ++++++++++++-----------
 5 files changed, 137 insertions(+), 106 deletions(-)

diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 4a45f724f01..de68313e6f8 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -779,8 +779,21 @@ if (empty($reshook))
 
 					$desc = dol_concatdesc($desc, $product_desc);
 
+					// Add dimensions into product description
+					/*if (empty($conf->global->MAIN_PRODUCT_DISABLE_AUTOADD_DIM))
+					{
+						$text='';
+						if ($prod->weight) $text.=($text?"\n":"").$outputlangs->trans("Weight").': '.$prod->weight.' '.$prod->weight_units;
+						if ($prod->length) $text.=($text?"\n":"").$outputlangs->trans("Length").': '.$prod->length.' '.$prod->length_units;
+						if ($prod->surface) $text.=($text?"\n":"").$outputlangs->trans("Surface").': '.$prod->surface.' '.$prod->surface_units;
+						if ($prod->volume) $text.=($text?"\n":"").$outputlangs->trans("Volume").': '.$prod->volume.' '.$prod->volume_units;
+
+						$desc = dol_concatdesc($desc, $text);
+					}*/
+
 					// Add custom code and origin country into description
-					if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code))) {
+					if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code)))
+					{
 						$tmptxt = '(';
 						if (! empty($prod->customcode))
 							$tmptxt .= $langs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 114648fdf14..36101e4b081 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2142,7 +2142,7 @@ abstract class CommonObject
         if ($elementTable == 'user') $fieldstatus="statut";
         if ($elementTable == 'expensereport') $fieldstatus="fk_statut";
 		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus="status";
-        
+
         $sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;
         $sql.= " SET ".$fieldstatus." = ".$status;
         // If status = 1 = validated, update also fk_user_valid
@@ -2804,12 +2804,7 @@ abstract class CommonObject
 			if ($line->fk_product > 0)
 			{
 				$product_static = new Product($this->db);
-
-				$product_static->type=$line->fk_product_type;
-				$product_static->id=$line->fk_product;
-				$product_static->ref=$line->ref;
-                if (! empty($line->entity))
-                    $product_static->entity=$line->entity;
+				$product_static->fetch($line->fk_product);
 				$text=$product_static->getNomUrl(1);
 
 				// Define output language and label
@@ -2842,7 +2837,7 @@ abstract class CommonObject
 				}
 
 				$text.= ' - '.(! empty($line->label)?$line->label:$label);
-				$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($line->description));
+				$description.=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($line->description));	// Description is what to show on popup. We shown nothing if already into desc.
 			}
 
 			// Output template part (modules that overwrite templates must declare this into descriptor)
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index cf22670e271..0a74845a763 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1175,6 +1175,7 @@ else
             print '</td></tr>';
 
             // Stock
+            /*
             if ($object->isproduct() && ! empty($conf->stock->enabled))
             {
                 print "<tr>".'<td>'.$langs->trans("StockLimit").'</td><td>';
@@ -1189,7 +1190,7 @@ else
             {
                 print '<input name="seuil_stock_alerte" type="hidden" value="'.$object->seuil_stock_alerte.'">';
                 print '<input name="desiredstock" type="hidden" value="'.$object->desiredstock.'">';
-            }
+            }*/
 
             // Nature
             if($object->type!=1)
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 56e721b67ac..910f5b316cd 100755
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2656,13 +2656,13 @@ class Product extends CommonObject
 	 *	@param		int		$level			Init level
 	 *  @return 	void
 	 */
-	function fetch_prod_arbo($prod, $compl_path="", $multiply=1, $level=1)
+	function fetch_prod_arbo($prod, $compl_path="", $multiply=1, $level=1, $id_parent=0)
 	{
 		global $conf,$langs;
 
 		$product = new Product($this->db);
 		//var_dump($prod);
-		foreach($prod as $id_product => $desc_pere)	// $id_product is 0 (there is no mode sub_product) or an id of a sub_product
+		foreach($prod as $id_product => $desc_pere)	// $id_product is 0 (first call starting with root top) or an id of a sub_product
 		{
 			if (is_array($desc_pere))	// If desc_pere is an array, this means it's a child
 			{
@@ -2679,6 +2679,7 @@ class Product extends CommonObject
 				$this->load_stock();	// Load stock
 				$this->res[]= array(
 					'id'=>$id,					// Id product
+					'id_parent'=>$id_parent,
 					'ref'=>$this->ref,			// Ref product
 					'nb'=>$nb,					// Nb of units that compose parent product
 					'nb_total'=>$nb*$multiply,	// Nb of units for all nb of product
@@ -2696,7 +2697,7 @@ class Product extends CommonObject
 				if (is_array($desc_pere['childs']))
 				{
 					//print 'YYY We go down for '.$desc_pere[3]." -> \n";
-					$this ->fetch_prod_arbo($desc_pere['childs'], $compl_path.$desc_pere[3]." -> ", $desc_pere[1]*$multiply, $level+1);
+					$this->fetch_prod_arbo($desc_pere['childs'], $compl_path.$desc_pere[3]." -> ", $desc_pere[1]*$multiply, $level+1, $id);
 				}
 			}
 		}
@@ -2718,7 +2719,7 @@ class Product extends CommonObject
 			$this->res[]= array($desc_pere[1],$desc_pere[0]);
 			if(count($desc_pere) >1)
 			{
-				$this ->fetch_prods($desc_pere);
+				$this->fetch_prods($desc_pere);
 			}
 		}
 	}
@@ -2736,7 +2737,7 @@ class Product extends CommonObject
 		{
 			foreach($this->sousprods as $prod_name => $desc_product)
 			{
-				if (is_array($desc_product)) $this->fetch_prod_arbo($desc_product,"",$multiply);
+				if (is_array($desc_product)) $this->fetch_prod_arbo($desc_product,"",$multiply,1,$this->id);
 			}
 		}
 		//var_dump($this->res);
@@ -2751,13 +2752,11 @@ class Product extends CommonObject
 	function get_each_prod()
 	{
 		$this->res = array();
-		if(is_array($this -> sousprods))
+		if (is_array($this->sousprods))
 		{
-			foreach($this -> sousprods as $nom_pere => $desc_pere)
+			foreach($this->sousprods as $nom_pere => $desc_pere)
 			{
-				if(count($desc_pere) >1)
-				$this ->fetch_prods($desc_pere);
-
+				if (count($desc_pere) >1) $this->fetch_prods($desc_pere);
 			}
 			sort($this->res);
 		}
@@ -2769,10 +2768,10 @@ class Product extends CommonObject
 	 *  Return all Father products fo current product
 	 *
 	 *  @return 	array prod
+	 *  @see		getParent
 	 */
 	function getFather()
 	{
-
 		$sql = "SELECT p.label as label,p.rowid,pa.fk_product_pere as id,p.fk_product_type";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product_association as pa,";
 		$sql.= " ".MAIN_DB_PREFIX."product as p";
@@ -2803,10 +2802,10 @@ class Product extends CommonObject
 	 *  Return all direct parent products fo current product
 	 *
 	 *  @return 	array prod
+	 *  @see		getFather
 	 */
 	function getParent()
 	{
-
 		$sql = "SELECT p.label as label,p.rowid,pa.fk_product_pere as id,p.fk_product_type";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product_association as pa,";
 		$sql.= " ".MAIN_DB_PREFIX."product as p";
@@ -2833,10 +2832,11 @@ class Product extends CommonObject
 	/**
 	 *  Return childs of product $id
 	 *
-	 * 	@param		int		$id			Id of product to search childs of
-	 *  @return     array       		Prod
+	 * 	@param		int		$id					Id of product to search childs of
+	 *  @param		int		$firstlevelonly		Return only direct child
+	 *  @return     array       				Prod
 	 */
-	function getChildsArbo($id)
+	function getChildsArbo($id, $firstlevelonly=0)
 	{
 		$sql = "SELECT p.rowid, p.label as label, pa.qty as qty, pa.fk_product_fils as id, p.fk_product_type, pa.incdec";
 		$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
@@ -2861,10 +2861,13 @@ class Product extends CommonObject
 				);
 				//$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']);
-				$listofchilds=$this->getChildsArbo($rec['id']);
-				foreach($listofchilds as $keyChild => $valueChild)
+				if (empty($firstlevelonly))
 				{
-					$prods[$rec['rowid']]['childs'][$keyChild] = $valueChild;
+					$listofchilds=$this->getChildsArbo($rec['id']);
+					foreach($listofchilds as $keyChild => $valueChild)
+					{
+						$prods[$rec['rowid']]['childs'][$keyChild] = $valueChild;
+					}
 				}
 			}
 
@@ -2910,6 +2913,7 @@ class Product extends CommonObject
 	function getNomUrl($withpicto=0,$option='',$maxlength=0)
 	{
 		global $conf, $langs;
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 
 		$result='';
         $newref=$this->ref;
@@ -2920,6 +2924,14 @@ class Product extends CommonObject
             $label .= '<br><b>' . $langs->trans('ProductRef') . ':</b> ' . $this->ref;
         if (! empty($this->label))
             $label .= '<br><b>' . $langs->trans('ProductLabel') . ':</b> ' . $this->label;
+
+        $tmptext='';
+		if ($this->weight) $tmptext.="<br>".$langs->trans("Weight").': '.$this->weight.' '.measuring_units_string($this->weight_units,"weight");
+		if ($this->length) $tmptext.="<br>".$langs->trans("Length").': '.$this->length.' '.measuring_units_string($this->length_units,'length');
+		if ($this->surface) $tmptext.="<br>".$langs->trans("Surface").': '.$this->surface.' '.measuring_units_string($this->surface_units,'surface');
+		if ($this->volume) $tmptext.="<br>".$langs->trans("Volume").': '.$this->volume.' '.measuring_units_string($this->volume_units,'volume');
+        if ($tmptext) $label .= $tmptext;
+
         if (! empty($this->entity))
             $label .= '<br>' . $this->show_photos($conf->product->multidir_output[$this->entity],1,1,0,0,0,80);
 
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index af339c8270c..53f79266c25 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -50,13 +50,13 @@ $fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : ''));
 $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
 $result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype);
 
-$product = new Product($db);
-$productid=0;
+$object = new Product($db);
+$objectid=0;
 if ($id > 0 || ! empty($ref))
 {
-	$result = $product->fetch($id,$ref);
-	$productid=$product->id;
-	$id=$product->id;
+	$result = $object->fetch($id,$ref);
+	$objectid=$object->id;
+	$id=$object->id;
 }
 
 
@@ -74,7 +74,7 @@ if ($action == 'add_prod' && ($user->rights->produit->creer || $user->rights->se
 	{
 		if ($_POST["prod_qty_".$i] > 0)
 		{
-			if ($product->add_sousproduit($id, $_POST["prod_id_".$i], $_POST["prod_qty_".$i], $_POST["prod_incdec_".$i]) > 0)
+			if ($object->add_sousproduit($id, $_POST["prod_id_".$i], $_POST["prod_qty_".$i], $_POST["prod_incdec_".$i]) > 0)
 			{
 				//var_dump($id.' - '.$_POST["prod_id_".$i].' - '.$_POST["prod_qty_".$i]);exit;
 				$action = 'edit';
@@ -83,16 +83,16 @@ if ($action == 'add_prod' && ($user->rights->produit->creer || $user->rights->se
 			{
 				$error++;
 				$action = 're-edit';
-				if ($product->error == "isFatherOfThis") {
+				if ($object->error == "isFatherOfThis") {
 					setEventMessage($langs->trans("ErrorAssociationIsFatherOfThis"), 'errors');
 				} else {
-					setEventMessage($product->error, 'errors');
+					setEventMessage($object->error, 'errors');
 				}
 			}
 		}
 		else
 		{
-			if ($product->del_sousproduit($id, $_POST["prod_id_".$i]) > 0)
+			if ($object->del_sousproduit($id, $_POST["prod_id_".$i]) > 0)
 			{
 				$action = 'edit';
 			}
@@ -100,13 +100,13 @@ if ($action == 'add_prod' && ($user->rights->produit->creer || $user->rights->se
 			{
 				$error++;
 				$action = 're-edit';
-				setEventMessage($product->error, 'errors');
+				setEventMessage($object->error, 'errors');
 			}
 		}
 	}
 	if (! $error)
 	{
-		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$product->id);
+		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit;
 	}
 }
@@ -117,7 +117,8 @@ else if($action==='save_composed_product')
 	{
 		foreach ($TProduct as $id_product => $row)
 		{
-			$product->update_sousproduit($id, $id_product,$row['qty'], isset($row['incdec']) ? 1 : 0 );
+			if ($row['qty'] > 0) $object->update_sousproduit($id, $id_product, $row['qty'], isset($row['incdec']) ? 1 : 0 );
+			else $object->del_sousproduit($id, $id_product);
 		}
 	}
 	$action='';
@@ -171,11 +172,11 @@ if ($action == 'search')
 //print $sql;
 
 
-llxHeader("","",$langs->trans("CardProduct".$product->type));
+llxHeader("","",$langs->trans("CardProduct".$object->type));
 
-$head=product_prepare_head($product, $user);
-$titre=$langs->trans("CardProduct".$product->type);
-$picto=($product->type==1?'service':'product');
+$head=product_prepare_head($object, $user);
+$titre=$langs->trans("CardProduct".$object->type);
+$picto=($object->type==1?'service':'product');
 dol_fiche_head($head, 'subproduct', $titre, 0, $picto);
 
 
@@ -191,20 +192,28 @@ if ($id > 0 || ! empty($ref))
 		print "<tr>";
 
 		$nblignes=6;
-		if ($product->isproduct() && ! empty($conf->stock->enabled)) $nblignes++;
-		if ($product->isservice()) $nblignes++;
+		if ($object->isproduct() && ! empty($conf->stock->enabled)) $nblignes++;
+		if ($object->isservice()) $nblignes++;
 
 			// Reference
 			print '<td width="25%">'.$langs->trans("Ref").'</td><td>';
-			print $form->showrefnav($product,'ref','',1,'ref');
+			print $form->showrefnav($object,'ref','',1,'ref');
 			print '</td>';
 
 		print '</tr>';
 
 		// Label
-		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$product->libelle.'</td>';
+		print '<tr><td>'.$langs->trans("Label").'</td><td>'.$object->libelle.'</td>';
 		print '</tr>';
 
+		// Nature
+		if($object->type!=1)
+		{
+			print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="2">';
+			print $object->getLibFinished();
+			print '</td></tr>';
+		}
+
 		if (empty($conf->global->PRODUIT_MULTIPRICES))
 		{
 		    // Price
@@ -232,28 +241,57 @@ if ($id > 0 || ! empty($ref))
 			print '</td></tr>';
 		}
 
+		print '</table>';
+
+		dol_fiche_end();
+
+
+		$prodsfather = $object->getFather(); 		// Parent Products
+		$object->get_sousproduits_arbo();			// Load $object->sousprod
+		$prods_arbo=$object->get_arbo_each_prod();
+		$nbofsubsubproducts=count($prods_arbo);		// This include sub sub product into nb
+		$prodschild = $object->getChildsArbo($id,1);
+		$nbofsubproducts=count($prodschild);		// This include only first level of childs
+
+
+		// Number of parent virtual products
+		print $form->textwithpicto($langs->trans("ParentProductsNumber").': '.count($prodsfather), $langs->trans('IfZeroItIsNotUsedByVirtualProduct'));
+
+		if (count($prodsfather) > 0)
+		{
+			print $langs->trans("ProductParentList").'<br>';
+			print '<table class="nobordernopadding">';
+			foreach($prodsfather as $value)
+			{
+				$idprod= $value["id"];
+				$productstatic->id=$idprod;// $value["id"];
+				$productstatic->type=$value["fk_product_type"];
+				$productstatic->ref=$value['label'];
+				print '<tr>';
+				print '<td>'.$productstatic->getNomUrl(1,'composition').'</td>';;
+				print '</tr>';
+			}
+			print '</table>';
+		}
+
+
+		print '<br>'."\n";
+
+
 		// Number of subproducts
-		$prodsfather = $product->getFather(); //Parent Products
-		$product->get_sousproduits_arbo();			// Defined $product->sousprod
-		$prods_arbo=$product->get_arbo_each_prod();
-		$nbofsubproducts=count($prods_arbo);
-		print '<tr><td>'.$langs->trans("AssociatedProductsNumber").'</td><td>';
-		print $form->textwithpicto($nbofsubproducts, $langs->trans('IfZeroItIsNotAVirtualProduct'));
-		print '</td>';
-		print '</tr>';
+		print $form->textwithpicto($langs->trans("AssociatedProductsNumber").': '.(empty($conf->global->PRODUCT_SHOW_SUB_SUB_PRODUCTS)?$nbofsubproducts:$nbofsubsubproducts), $langs->trans('IfZeroItIsNotAVirtualProduct'));
 
 		// List of subproducts
 		if (count($prods_arbo) > 0)
 		{
 			$atleastonenotdefined=0;
-			print '<tr><td colspan="2">';
 			print $langs->trans("ProductAssociationList").'<br>';
 
 			print '<form name="formComposedProduct" action="'.$_SERVER['PHP_SELF'].'" method="post">';
 			print '<input type="hidden" name="action" value="save_composed_product" />';
 			print '<input type="hidden" name="id" value="'.$id.'" />';
 
-			print '<table class="centpercent nobordernopadding">';
+			print '<table class="centpercent noborder">';
 
 			print '<tr class="liste_titre">';
 			print '<td>'.$langs->trans('ComposedProduct').'</td>';
@@ -262,7 +300,7 @@ if ($id > 0 || ! empty($ref))
 			if (! empty($conf->stock->enabled)) print '<td align="right">'.$langs->trans('Stock').'</td>';
 			print '<td align="center">'.$langs->trans('Qty').'</td>';
 			print '<td align="center">'.$langs->trans('ComposedProductIncDecStock').'</td>';
-			print '</tr>';
+			print '</tr>'."\n";
 
 			foreach($prods_arbo as $value)
 			{
@@ -270,11 +308,11 @@ if ($id > 0 || ! empty($ref))
 				$productstatic->type=$value['type'];
 				$productstatic->label=$value['label'];
 
-				$class=($class=='impair')?'pair':'impair';
-
-				print '<tr class="'.$class.'">';
 				if ($value['level'] <= 1)
 				{
+					$class=($class=='impair')?'pair':'impair';
+					print '<tr class="'.$class.'">';
+
 					$notdefined=0;
 					$productstatic->ref=$value['ref'];
 					$nb_of_subproduct = $value['nb'];
@@ -312,9 +350,17 @@ if ($id > 0 || ! empty($ref))
 						print '<td>'.$nb_of_subproduct.'</td>';
 						print '<td>'.($value['incdec']==1?'x':''  ).'</td>';
 					}
+
+					print '</tr>'."\n";
 				}
-				else
+				else 	// By default, we do not show this. It makes screen very difficult to understand
 				{
+					$hide='';
+					if (empty($conf->global->PRODUCT_SHOW_SUB_SUB_PRODUCTS)) $hide=' hideobject';
+
+					$class=($class=='impair')?'pair':'impair';
+					print '<tr class="'.$class.$hide.'" id="sub-'.$value['id_parent'].'">';
+
 					//$productstatic->ref=$value['label'];
 					$productstatic->ref=$value['ref'];
 					print '<td>';
@@ -328,8 +374,9 @@ if ($id > 0 || ! empty($ref))
 					if (! empty($conf->stock->enabled)) print '<td></td>';	// Real stock
 					print '<td align="center">'.$value['nb'].'</td>';
 					print '<td>&nbsp;</td>';
+
+					print '</tr>'."\n";
 				}
-				print '</tr>';
 			}
 			print '<tr class="liste_total">';
 			print '<td class="liste_total"></td>';
@@ -348,19 +395,13 @@ if ($id > 0 || ! empty($ref))
 			// Stock
 			if (! empty($conf->stock->enabled)) print '<td class="liste_total" align="right">&nbsp;</td>';
 
-			print '<td align="center">';
+			print '<td align="right" colspan="2">';
 			if ($user->rights->produit->creer || $user->rights->service->creer)
 			{
 				print '<input type="submit" class="button" value="'.$langs->trans('Save').'">';
 			}
 			print '</td>';
-			print '<td align="center">';
-			if ($user->rights->produit->creer || $user->rights->service->creer)
-			{
-				print '<input type="submit" class="button" value="'.$langs->trans('Save').'">';
-			}
-			print '</td>';
-			print '</tr>';
+			print '</tr>'."\n";
 			print '</table>';
 
 			/*if($user->rights->produit->creer || $user->rights->service->creer) {
@@ -368,39 +409,8 @@ if ($id > 0 || ! empty($ref))
 			}*/
 
 			print '</form>';
-
-			print '</td></tr>';
 		}
 
-		// Number of parent virtual products
-		print '<tr class="pair"><td>'.$langs->trans("ParentProductsNumber").'</td><td>';
-		print $form->textwithpicto(count($prodsfather), $langs->trans('IfZeroItIsNotUsedByVirtualProduct'));
-		print '</td></tr>';
-
-		if (count($prodsfather) > 0)
-		{
-			print '<tr><td colspan="2">';
-			print $langs->trans("ProductParentList").'<br>';
-			print '<table class="nobordernopadding">';
-			foreach($prodsfather as $value)
-			{
-				$idprod= $value["id"];
-				$productstatic->id=$idprod;// $value["id"];
-				$productstatic->type=$value["fk_product_type"];
-				$productstatic->ref=$value['label'];
-				print '<tr>';
-				print '<td>'.$productstatic->getNomUrl(1,'composition').'</td>';;
-				print '</tr>';
-			}
-			print '</table>';
-			print '</td></tr>';
-		}
-
-		print '</table>';
-
-		dol_fiche_end();
-
-
 		// Form with product to add
 		if ((empty($action) || $action == 'view' || $action == 'edit' || $action == 'search' || $action == 're-edit') && ($user->rights->produit->creer || $user->rights->service->creer))
 		{
@@ -500,11 +510,11 @@ if ($id > 0 || ! empty($ref))
 						print '<td>'.$labeltoshow.'</td>';
 
 
-						if($product->is_sousproduit($id, $objp->rowid))
+						if($object->is_sousproduit($id, $objp->rowid))
 						{
 							//$addchecked = ' checked="checked"';
-							$qty=$product->is_sousproduit_qty;
-							$incdec=$product->is_sousproduit_incdec;
+							$qty=$object->is_sousproduit_qty;
+							$incdec=$object->is_sousproduit_incdec;
 						}
 						else
 						{

From 59cbde042c8f919614c61a9863b304519eac58ba Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Mar 2015 17:29:52 +0100
Subject: [PATCH 67/93] Generalize option MAIN_HTML_TITLE for all tabs of
 thirdparty.

---
 htdocs/categories/categorie.php |  4 +++-
 htdocs/societe/agenda.php       |  5 ++++-
 htdocs/societe/consumption.php  |  6 ++++--
 htdocs/societe/document.php     |  4 +++-
 htdocs/societe/info.php         | 12 ++++++------
 htdocs/societe/notify/card.php  |  8 ++++++--
 6 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index 0746475ecec..e116ac668ab 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -235,7 +235,9 @@ if ($socid)
 	$soc = new Societe($db);
 	$result = $soc->fetch($socid);
 
-	llxHeader("","",$langs->trans("Category"));
+	$title=$langs->trans("Category");
+	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$soc->name." - ".$title;
+	llxHeader("",$title);
 
 	// Show tabs
 	$head = societe_prepare_head($soc);
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 19d943798ce..e3b273796fa 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -69,7 +69,10 @@ if ($socid)
 
 	$object = new Societe($db);
 	$result = $object->fetch($socid);
-	llxHeader("",$langs->trans("Agenda"),'');
+
+	$title=$langs->trans("Agenda");
+	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	llxHeader('',$title);
 
 	if (! empty($conf->notification->enabled)) $langs->load("mails");
 	$head = societe_prepare_head($object);
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index d8aad10d054..e581b6b8c29 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -98,8 +98,10 @@ $form = new Form($db);
 $formother = new FormOther($db);
 $productstatic=new Product($db);
 
-$titre = $langs->trans("Referer",$object->name);
-llxHeader('',$titre,'');
+$title = $langs->trans("Referer",$object->name);
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('',$title,$help_url);
 
 if (empty($socid))
 {
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index c2ad751f196..f3c217d0a54 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -82,8 +82,10 @@ include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php
 
 $form = new Form($db);
 
+$title=$langs->trans("ThirdParty").' - '.$langs->trans("Files");
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Files");
 $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$langs->trans("ThirdParty").' - '.$langs->trans("Files"),$help_url);
+llxHeader('',$title,$help_url);
 
 if ($object->id)
 {
diff --git a/htdocs/societe/info.php b/htdocs/societe/info.php
index 9d06d203d9c..b3586c4f327 100644
--- a/htdocs/societe/info.php
+++ b/htdocs/societe/info.php
@@ -56,16 +56,16 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
  *	View
  */
 
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$langs->trans("ThirdParty"),$help_url);
-
 $object = new Societe($db);
 $object->fetch($socid);
 $object->info($socid);
 
-/*
- * Affichage onglets
- */
+$title=$langs->trans("ThirdParty");
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Info");
+$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('',$title,$help_url);
+
+
 $head = societe_prepare_head($object);
 
 dol_fiche_head($head, 'info', $langs->trans("ThirdParty"),0,'company');
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 1845669dcfc..e5de6a89d92 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -123,11 +123,15 @@ if ($action == 'delete')
 
 $form = new Form($db);
 
-llxHeader();
-
 $object = new Societe($db);
 $result=$object->fetch($socid);
 
+$title=$langs->trans("ThirdParty").' - '.$langs->trans("Notification");
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Notification");
+$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('',$title,$help_url);
+
+
 if ($result > 0)
 {
     $langs->load("other");

From 9b4f65587f4a0b6fa76a4e21fc10a4362fff7247 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Mar 2015 13:27:24 +0100
Subject: [PATCH 68/93] Fix option MAIN_HTML_TITLE

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

diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index df2f09cc3e3..f94664531dd 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -111,8 +111,8 @@ if ($id > 0 && empty($object->id))
 
 if ($object->id > 0)
 {
-	$title=$langs->trans("SupplierCard");
-	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name;
+	$title=$langs->trans("ThirdParty")." - ".$langs->trans('SupplierCard');
+	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$langs->trans('SupplierCard');
 	$help_url='';
 	llxHeader('',$title, $help_url);
 

From 622d8ad9b04764e91aa6f7fe4281600bc4385514 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Mar 2015 13:51:35 +0100
Subject: [PATCH 69/93] Remove duplicate entry

---
 htdocs/langs/en_US/suppliers.lang | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang
index fb7dbd26032..53b0618c7b1 100644
--- a/htdocs/langs/en_US/suppliers.lang
+++ b/htdocs/langs/en_US/suppliers.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Suppliers
-Supplier=Supplier
 AddSupplier=Create a supplier
 SupplierRemoved=Supplier removed
 SuppliersInvoice=Suppliers invoice

From dfe1ee7e7d26dbb5d73a8fff685d5d8223309a95 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Mar 2015 14:11:59 +0100
Subject: [PATCH 70/93] Fix: count of notification emails was wrong

---
 htdocs/langs/en_US/other.lang  |  2 +-
 htdocs/societe/notify/card.php | 32 +++++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index f5b39b3f704..1e3a7f038ff 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -54,7 +54,7 @@ MaxSize=Maximum size
 AttachANewFile=Attach a new file/document
 LinkedObject=Linked object
 Miscellaneous=Miscellaneous
-NbOfActiveNotifications=Number of notifications
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__
 PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__SIGNATURE__
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index 1845669dcfc..388a271cd8c 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -169,6 +169,8 @@ if ($result > 0)
 
     print '<tr><td>'.$langs->trans("NbOfActiveNotifications").'</td>';
     print '<td colspan="3">';
+    $nb=0;
+    // List of per contact notifications
     $sql = "SELECT COUNT(n.rowid) as nb";
     $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n";
     $sql.= " WHERE fk_soc = ".$object->id;
@@ -187,6 +189,13 @@ if ($result > 0)
     else {
         dol_print_error($db);
     }
+    // List of notifications enabled for fixed email
+    foreach($conf->global as $key => $val)
+    {
+    	if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue;
+    	$listtmp=explode(',',$val);
+    	$nb+=count($listtmp);
+    }
     print $nb;
     print '</td></tr>';
     print '</table>';
@@ -273,16 +282,21 @@ if ($result > 0)
     foreach($conf->global as $key => $val)
     {
     	if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue;
-    	//print $key.' - '.$val.' - '.$reg[1].'<br>';
-		print '<tr '.$bc[$var].'><td>'.$val;
-		if (isValidEmail($val))
+		print '<tr '.$bc[$var].'><td>';
+		$listtmp=explode(',',$val);
+		foreach($listtmp as $keyemail => $valemail)
 		{
-			print ' &lt;'.$val.'&gt;';
-		}
-		else
-		{
-			$langs->load("errors");
-			print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail",$val);
+			$valemail=trim($valemail);
+    		//print $keyemail.' - '.$valemail.' - '.$reg[1].'<br>';
+			if (isValidEmail($valemail))
+			{
+				print ' &lt;'.$valemail.'&gt;';
+			}
+			else
+			{
+				$langs->load("errors");
+				print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail",$valemail);
+			}
 		}
 		print '</td>';
 		print '<td>';

From 279e16a8112cafabc29e911828bdc2eeebddd5ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Mar 2015 14:24:32 +0100
Subject: [PATCH 71/93] grey disabled

---
 htdocs/theme/eldy/style.css.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 206b1df019e..e6dbf78d6a0 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -363,7 +363,7 @@ fieldset { border: 1px solid #AAAAAA !important; box-shadow: 2px 2px 3px #DDD; }
 }
 .buttonRefused {
 	pointer-events: none;
-   	cursor: default;	
+   	cursor: default;
 	opacity: 0.4;
     filter: alpha(opacity=40); /* For IE8 and earlier */
     box-shadow: none;
@@ -2949,7 +2949,10 @@ div.dolEventError h1, div.dolEventError h2 {
 {
 	border: 1px solid #aaa;
 }
-
+.select2-disabled
+{
+	color: #888;
+}
 .select2-drop-active
 {
 	border: 1px solid #aaa;

From 895b2c6e9c79dec5377c335b0843f974992a6392 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Mar 2015 14:37:27 +0100
Subject: [PATCH 72/93] Fix bad merge

---
 htdocs/comm/action/peruser.php | 2 +-
 htdocs/core/lib/agenda.lib.php | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 0f281a91af4..15915b758e0 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -614,7 +614,7 @@ else
 	if ($usergroup > 0)	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user";
 	$sql.= " WHERE u.entity IN (".getEntity('user',1).")";
 	if ($usergroup > 0)	$sql.= " AND ug.fk_usergroup = ".$usergroup;
-	if (GETPOST("usertodo","int",3) > 0) $sql.=" AND u.rowid = ".GETPOST("usertodo","int",3);
+	//if (GETPOST("usertodo","int",3) > 0) $sql.=" AND u.rowid = ".GETPOST("usertodo","int",3);
 	//print $sql;
 	$resql=$db->query($sql);
 	if ($resql)
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index d277511785c..174b1c79092 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -140,10 +140,6 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		if (empty($conf->dol_use_jmobile)) print ' - ';
 		print '<input type="number" class="short" name="end_d" value="'.$end_d.'" min="1" max="7">';
 		print '</td></tr>';
-
-		print '<tr><td>'.$langs->trans("AgendaShowBirthdayEvents").' <input type="checkbox" id="check_birthday" name="check_birthday"></td></tr>';
-		print '</table>';
-		print '</td>';
 	}
 
 	// Hooks

From a452823e1ed420c94091351390e340a558dd5476 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Mar 2015 15:20:08 +0100
Subject: [PATCH 73/93] Include option FCKEDITOR_ENABLE_DETAILS_FULL to restore
 compatibility with 3.6

---
 htdocs/core/tpl/objectline_create.tpl.php | 4 +++-
 htdocs/core/tpl/objectline_edit.tpl.php   | 4 +++-
 htdocs/theme/eldy/ckeditor/config.js      | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index e3f2431783f..7cb2cc7cdf3 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -186,7 +186,9 @@ else {
 	$nbrows=ROWS_2;
 	$enabled=(! empty($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
 	if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-	$doleditor=new DolEditor('dp_desc',GETPOST('dp_desc'),'',100,'dolibarr_details','',false,true,$enabled,$nbrows,'98%');
+	$toolbarname='dolibarr_details';
+	if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
+	$doleditor=new DolEditor('dp_desc',GETPOST('dp_desc'),'',100,$toolbarname,'',false,true,$enabled,$nbrows,'98%');
 	$doleditor->Create();
 	?>
 	</td>
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 69550d546d5..c43b8be9e20 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -88,7 +88,9 @@ $coldisplay=-1; // We remove first td
     $nbrows=ROWS_2;
     if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
     $enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
-	$doleditor=new DolEditor('product_desc',$line->description,'',164,'dolibarr_details','',false,true,$enable,$nbrows,'98%');
+	$toolbarname='dolibarr_details';
+	if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
+	$doleditor=new DolEditor('product_desc',$line->description,'',164,$toolbarname,'',false,true,$enable,$nbrows,'98%');
 	$doleditor->Create();
 	?>
 	</td>
diff --git a/htdocs/theme/eldy/ckeditor/config.js b/htdocs/theme/eldy/ckeditor/config.js
index 97f1c0a0b62..cffaadfba6e 100644
--- a/htdocs/theme/eldy/ckeditor/config.js
+++ b/htdocs/theme/eldy/ckeditor/config.js
@@ -76,7 +76,7 @@ CKEDITOR.editorConfig = function( config )
 	[
 	 	['Source','Maximize'],
 	 	['Cut','Copy','Paste','-','SpellChecker'],
-	    ['Font','FontSize'],
+	    ['Format','Font','FontSize'],
 	    ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'],
 	 	['NumberedList','BulletedList','Outdent','Indent'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],

From b47e16fbe9ce92c7bc406791b20c8c93b0a36188 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Mar 2015 16:02:40 +0100
Subject: [PATCH 74/93] Update changelog

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

diff --git a/ChangeLog b/ChangeLog
index ae63471c9af..64cd43f7030 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -130,6 +130,7 @@ For translators:
 - New: When a translation is not available we always jump to en_US and only en_US.
 
 For developers:
+- New: Syslog module can be set to use ChromePHP plugin to output log server into browser console.
 - New: Add a css style "cursorpointer".
 - New: Select list of users can return user into hierarchy.
 - New: getBrowserInfo can return type of layout of browser (classic/phone/tablet)

From 5cc48c7c78b3d3cee1d84d1fc19de49d242824c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Mar 2015 16:20:42 +0100
Subject: [PATCH 75/93] Prepare cleaning tools for release.

---
 dev/fixdosfiles.sh                                     |  1 +
 dev/fixduplicatelangkey.sh                             |  1 +
 ...atefilelinesrecursively.sh => fixduplicatelines.sh} | 10 ++++++----
 dev/fixperms.sh                                        |  1 +
 dev/fixutf8bomfiles.sh                                 |  1 +
 5 files changed, 10 insertions(+), 4 deletions(-)
 rename dev/{deduplicatefilelinesrecursively.sh => fixduplicatelines.sh} (59%)

diff --git a/dev/fixdosfiles.sh b/dev/fixdosfiles.sh
index 30d47e7b0c4..e38e3d49d82 100755
--- a/dev/fixdosfiles.sh
+++ b/dev/fixdosfiles.sh
@@ -10,6 +10,7 @@
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
 then
+    echo "Detect and fix files ending with bad ending chars (must be LF)"
 	echo "Usage: fixdosfiles.sh [list|fix]"
 fi
 
diff --git a/dev/fixduplicatelangkey.sh b/dev/fixduplicatelangkey.sh
index 2d9cb7f7a85..ae0be750646 100755
--- a/dev/fixduplicatelangkey.sh
+++ b/dev/fixduplicatelangkey.sh
@@ -7,6 +7,7 @@
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
 then
+    echo "Detect duplicate translation keys inside a file (there is no cross file check)."
 	echo "Usage: detectduplicatelangkey.sh (list|fix)"
 fi
 
diff --git a/dev/deduplicatefilelinesrecursively.sh b/dev/fixduplicatelines.sh
similarity index 59%
rename from dev/deduplicatefilelinesrecursively.sh
rename to dev/fixduplicatelines.sh
index a0eb14974f0..18f9707169e 100755
--- a/dev/deduplicatefilelinesrecursively.sh
+++ b/dev/fixduplicatelines.sh
@@ -9,17 +9,19 @@
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
 then
+	echo "Find exact duplicated lines into file (not cross file checking)"
 	echo "Usage: deduplicatefilelinesrecursively.sh [list|fix]"
 fi
 
 # To detect
 if [ "x$1" = "xlist" ]
 then
-    for file in `find . -type f -name *.lang`
+    for file in `find htdocs/langs/en_US -type f -name *.lang`
     do
-        if [ `sort "$file" | uniq -d | wc -l` -gt 0 ]
+        if [ `sort "$file" | grep -v '^$' | uniq -d | wc -l` -gt 0 ]
         then
-            echo "$file"
+            echo "***** $file"
+            sort "$file" | grep -v '^$' | uniq -d
         fi
     done
 fi
@@ -27,7 +29,7 @@ fi
 # To fix
 if [ "x$1" = "xfix" ]
 then
-    for file in `find . -type f -name *.lang`
+    for file in `find htdocs/langs/en_US -type f -name *.lang`
     do
     	awk -i inplace ' !x[$0]++' "$file"
     done;
diff --git a/dev/fixperms.sh b/dev/fixperms.sh
index 5844e8b2916..5b027ad1580 100755
--- a/dev/fixperms.sh
+++ b/dev/fixperms.sh
@@ -10,6 +10,7 @@
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
 then
+	echo "Fix permissions of files"
 	echo "Usage: fixperms.sh (list|fix)"
 fi
 
diff --git a/dev/fixutf8bomfiles.sh b/dev/fixutf8bomfiles.sh
index db34cdcdc1d..bda503d28ec 100755
--- a/dev/fixutf8bomfiles.sh
+++ b/dev/fixutf8bomfiles.sh
@@ -12,6 +12,7 @@
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
 then
+    echo "Detect and fix bad UTF8 encoded files (UTF8 must not use BOM char)"
 	echo "Usage: fixutf8bomfiles.sh (list|fix) [addincludes]"
 fi
 

From 927925f4fdb50898d9bbef98f25aee229e98b61a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Mar 2015 17:42:50 +0100
Subject: [PATCH 76/93] Can also sync alternatives languages from transifex
 now.

---
 dev/fixaltlanguages.sh                  | 54 +++++++++++++++++++++++++
 dev/translation/strip_language_file.php | 14 +++----
 2 files changed, 61 insertions(+), 7 deletions(-)
 create mode 100755 dev/fixaltlanguages.sh

diff --git a/dev/fixaltlanguages.sh b/dev/fixaltlanguages.sh
new file mode 100755
index 00000000000..d6d1946b7d1
--- /dev/null
+++ b/dev/fixaltlanguages.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+# Recursively deduplicate file lines on a per file basis
+# Useful to deduplicate language files
+#
+# Needs awk 4.0 for the inplace fixing command
+#
+# Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr
+
+# Syntax
+if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
+then
+	echo "Scan alternate language files and remove entries found into parent file"
+	echo "Usage: fixaltlanguages.sh (list|fix) (all|file.lang) [xx_XX]"
+	exit
+fi
+if [ "x$2" = "x" ]
+then
+	echo "Scan alternate language files and remove entries found into parent file"
+	echo "Usage: fixaltlanguages.sh (list|fix) (all|file.lang) [xx_XX]"
+	exit
+fi
+
+# To detect
+if [ "x$1" = "xlist" ]
+then
+	echo Feature not available
+fi
+
+# To fix
+if [ "x$1" = "xfix" ]
+then
+    for dir in `find htdocs/langs/$3* -type d`
+    do
+    	dirshort=`basename $dir`
+    	#echo $dirshort
+    	
+		export aa=`echo $dirshort | nawk -F"_" '{ print $1 }'`
+        export bb=`echo $dirshort | nawk -F"_" '{ print $2 }'`
+        aaupper=`echo $dirshort | nawk -F"_" '{ print toupper($1) }'`
+    	bblower=`echo $dirshort | nawk -F"_" '{ print tolower($2) }'`
+    	if [ "$aa" != "$bblower" ]
+    	then
+    	    reflang="htdocs/langs/"$aa"_"$aaupper
+    	    if [ -d $reflang ]
+    	    then
+		    	echo "***** Process language "$aa"_"$bb" - Search original into "$reflang
+    			echo $dirshort est une langue alternative de $reflang
+    			echo ./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2
+    			./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2
+    			for fic in `ls htdocs/langs/${aa}_${bb}/*.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done 
+    		fi
+    	fi
+    done;
+fi
diff --git a/dev/translation/strip_language_file.php b/dev/translation/strip_language_file.php
index 42a70c8c1a6..e3c31b89b58 100755
--- a/dev/translation/strip_language_file.php
+++ b/dev/translation/strip_language_file.php
@@ -25,7 +25,7 @@
  *
  * Usage:
  * cd htdocs/langs
- * ../../dev/translation/strip_language_file.php <primary_lang_dir> <secondary_lang_dir> [file.lang|all]
+ * ./dev/translation/strip_language_file.php <primary_lang_dir> <secondary_lang_dir> [file.lang|all]
  *
  * To rename all .delta files, you can do
  * for fic in `ls *.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done
@@ -66,7 +66,7 @@ if (empty($lPrimary) || empty($lSecondary) || empty($filesToProcess))
 {
 	$rc = 1;
 	$msg = '***** Script to clean language files *****'."\n";
-	$msg.= 'Usage: ../../dev/translation/strip_language_file.php xx_XX xx_YY [file.lang|all]'."\n";
+	$msg.= 'Usage: ./dev/translation/strip_language_file.php xx_XX xx_YY [file.lang|all]'."\n";
 	print $msg . "(rc=$rc).\n";
 	exit($rc);
 }
@@ -77,7 +77,7 @@ $aSecondary = array();
 // Define array $filesToProcess
 if ($filesToProcess == 'all')
 {
-	$dir = new DirectoryIterator($lPrimary);
+	$dir = new DirectoryIterator('htdocs/langs/'.$lPrimary);
 	while($dir->valid()) {
 		if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./',$dir->getFilename())) {
 			$files[] =  $dir->getFilename();
@@ -94,8 +94,8 @@ else $filesToProcess=explode(',',$filesToProcess);
 // Loop on each file
 foreach($filesToProcess as $fileToProcess)
 {
-	$lPrimaryFile = $lPrimary.'/'.$fileToProcess;
-	$lSecondaryFile = $lSecondary.'/'.$fileToProcess;
+	$lPrimaryFile = 'htdocs/langs/'.$lPrimary.'/'.$fileToProcess;
+	$lSecondaryFile = 'htdocs/langs/'.$lSecondary.'/'.$fileToProcess;
 	$output = $lSecondaryFile . '.delta';
 
 	print "---- Process language file ".$lSecondaryFile."\n";
@@ -270,8 +270,8 @@ foreach($filesToProcess as $fileToProcess)
 
 	print "Output can be found at $output.\n";
 
-	print "To rename all .delta files, you can do\n";
-	print 'for fic in `ls *.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n";
+	print "To rename all .delta files, you can do:\n";
+	print '> for fic in `ls htdocs/langs/'.$lSecondary.'/*.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n";
 }
 
 

From f75749cc2b3232ab586d73e1cf04abe0f2fce4ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Mar 2015 17:43:04 +0100
Subject: [PATCH 77/93] Sync transifex

---
 htdocs/langs/de_AT/admin.lang       |  2 --
 htdocs/langs/es_AR/admin.lang       |  2 +-
 htdocs/langs/es_CL/admin.lang       |  6 ++----
 htdocs/langs/es_DO/admin.lang       |  4 +---
 htdocs/langs/es_HN/admin.lang       |  2 +-
 htdocs/langs/es_MX/admin.lang       |  2 +-
 htdocs/langs/es_PE/admin.lang       |  2 +-
 htdocs/langs/es_PR/admin.lang       |  2 +-
 htdocs/langs/pt_BR/accountancy.lang |  9 ++++-----
 htdocs/langs/pt_BR/admin.lang       |  4 ----
 htdocs/langs/pt_BR/agenda.lang      |  1 -
 htdocs/langs/pt_BR/banks.lang       |  3 ---
 htdocs/langs/pt_BR/boxes.lang       |  1 -
 htdocs/langs/pt_BR/categories.lang  |  3 ---
 htdocs/langs/pt_BR/commercial.lang  |  1 -
 htdocs/langs/pt_BR/companies.lang   |  3 ---
 htdocs/langs/pt_BR/compta.lang      |  4 ----
 htdocs/langs/pt_BR/contracts.lang   |  3 ---
 htdocs/langs/pt_BR/install.lang     |  5 -----
 htdocs/langs/pt_BR/languages.lang   |  3 ---
 htdocs/langs/pt_BR/mails.lang       |  2 --
 htdocs/langs/pt_BR/main.lang        | 16 +---------------
 htdocs/langs/pt_BR/other.lang       |  1 -
 htdocs/langs/pt_BR/products.lang    |  1 -
 htdocs/langs/pt_BR/projects.lang    |  8 --------
 htdocs/langs/pt_BR/resource.lang    |  9 ---------
 htdocs/langs/pt_BR/users.lang       |  6 ------
 27 files changed, 13 insertions(+), 92 deletions(-)

diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index 3e63292c41f..72053d81e4b 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -70,9 +70,7 @@ Permission2413=Maßnahmen (Termine oder Aufgaben) Anderer löschen
 Permission2501=Dokumente hochladen oder löschen
 DictionaryCompanyType=Art des Unternehmens
 DictionaryCompanyJuridicalType=Rechtsform
-DictionaryProspectLevel=Geschäftsaussicht
 DictionaryCanton=Bundesland
-DictionaryActions=Maßnahmen
 VATReceivedOnly=Nur Mehtwertsteuererhalt
 VATIsNotUsedDesc=Die vorgeschlagene MwSt. ist standardmäßig 0 für alle Fälle wie Stiftungen, Einzelpersonen oder Kleinunternehmen-
 VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index 6aa9664cdfb..39a4dac9a4e 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - es_AR - admin 
+# Dolibarr language file - Source file is en_US - admin
 Module30Name=Facturas y notas de crédito
 Module30Desc=Gestión de facturas y notas de crédito a clientes. Gestión facturas de proveedores
 BillsNumberingModule=Módulo de numeración de facturas y notas de crédito
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 20f6fdfea33..a1849146e7f 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -1,3 +1,4 @@
+# Dolibarr language file - Source file is en_US - admin
 Module20Name=Cotizaciones
 Module20Desc=Gestión de cotizaciones/propuestas comerciales
 Permission21=Consultar cotizaciones
@@ -7,10 +8,7 @@ Permission25=Enviar las cotizaciones
 Permission26=Cerrar cotizaciones
 Permission27=Eliminar cotizaciones
 Permission28=Exportar las cotizaciones
-DictionnarySource=Orígenes de cotizaciones/pedidos
 VATIsUsedDesc=El tipo de IVA propuesto por defecto en las creaciones de cotizaciones, facturas, pedidos, etc. Responde a la siguiente regla:<br>Si el vendedor no está sujeto a IVA, IVA por defecto=0. Final de regla.<br>Si el país del vendedor= país del comprador entonces IVA por defecto=IVA del producto vendido. Final de regla.<br>Si vendedor y comprador residen en la Comunidad Europea y el bien vendido= nuevo medio de transportes (auto, barco, avión), IVA por defecto=0 (el IVA debe ser pagado por comprador a la hacienda pública de su país y no al vendedor). Final de regla<br>Si vendedor y comprador residen en la Comunidad Europea y comprador= particular o empresa sin NIF intracomunitario entonces IVA por defecto=IVA del producto vendido. Final de regla.<br>Si vendedor y comprador residen en la Comunidad Europea y comprador= empresa con NIF intracomunitario entonces IVA por defecto=0. Final de regla.<br>Si no, IVA propuesto por defecto=0. Final de regla.<br>
-VATIsNotUsedDesc=El tipo de IVA propuesto por defecto es 0. Este es el caso de asociaciones, particulares o algunas pequeñas sociedades.
-VATIsUsedExampleFR=En Francia, se trata de las sociedades u organismos que eligen un régimen fiscal general (General simplificado o General normal), régimen en el cual se declara el IVA.
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Tolerancia de retraso antes de la alerta (en días) sobre cotizaciones a cerrar
 Delays_MAIN_DELAY_PROPALS_TO_BILL=Tolerancia de retraso antes de la alerta (en días) sobre cotizaciones no facturadas
 WebCalAddEventOnStatusPropal=Añadir evento en el calendario en el cambio de estado de las cotizaciones
@@ -20,4 +18,4 @@ ProposalsPDFModules=Modelos de documentos de cotizaciones
 HideTreadedPropal=Ocultar las cotizaciones procesados del listado
 FreeLegalTextOnProposal=Texto libre en cotizaciones
 WatermarkOnDraftProposal=Marca de agua en cotizaciones borrador (en caso de estar vacío)
-FCKeditorForProductDetails=Creación/edición WYSIWIG de las líneas de detalle de los productos (en pedidos, cotizaciones, facturas, etc.)
\ No newline at end of file
+FCKeditorForProductDetails=Creación/edición WYSIWIG de las líneas de detalle de los productos (en pedidos, cotizaciones, facturas, etc.)
diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
index 8fcc2394a87..f4213f15cbc 100644
--- a/htdocs/langs/es_DO/admin.lang
+++ b/htdocs/langs/es_DO/admin.lang
@@ -13,12 +13,10 @@ VATIsUsedExampleFR=En Francia, se trata de las sociedades u organismos que elige
 VATIsNotUsedExampleFR=En Francia, se trata de asociaciones exentas de ITBIS o sociedades, organismos o profesiones liberales que han elegido el régimen fiscal de módulos (ITBIS en franquicia), pagando un ITBIS en franquicia sin hacer declaración de IVA. Esta elección hace aparecer la anotación  "IVA no aplicable - art-293B del CGI" en las facturas.
 LocalTax1IsUsedDesc=Uso de un 2º tipo de impuesto (Distinto del ITBIS)
 LocalTax1IsNotUsedDesc=No usar un 2º tipo de impuesto (Distinto del ITBIS)
-LocalTax2IsUsedDesc=Uso de un 3er. tipo de impuesto (Distinto del IVA)
-LocalTax2IsNotUsedDesc=No usar un 3er. tipo de impuesto (Distinto del IVA)
 UnitPriceOfProduct=Precio unitario sin ITBIS de un producto
 ShowVATIntaInAddress=Ocultar el identificador ITBIS en las direcciones de los documentos
 OptionVatMode=Opción de carga de ITBIS
 OptionVatDefaultDesc=La carga del ITBIS es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre el pago por los servicios
 OptionVatDebitOptionDesc=La carga del ITBIS es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre la facturación de los servicios
 SummaryOfVatExigibilityUsedByDefault=Tiempo de exigibilidad de ITBIS por defecto según la opción eligida
-YourCompanyDoesNotUseVAT=Su empresa está configurada como no sujeta al ITBIS (Inicio - Configuración - Empresa/Institución), por lo que no hay opción para la paremetrización del ITBIS.
\ No newline at end of file
+YourCompanyDoesNotUseVAT=Su empresa está configurada como no sujeta al ITBIS (Inicio - Configuración - Empresa/Institución), por lo que no hay opción para la paremetrización del ITBIS.
diff --git a/htdocs/langs/es_HN/admin.lang b/htdocs/langs/es_HN/admin.lang
index a823583bd50..1008ca5171d 100644
--- a/htdocs/langs/es_HN/admin.lang
+++ b/htdocs/langs/es_HN/admin.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - es_HN - admin 
+# Dolibarr language file - Source file is en_US - admin
 Permission91=Consultar impuestos e ISV
 Permission92=Crear/modificar impuestos e ISV
 Permission93=Eliminar impuestos e ISV
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index b8c2794cf3c..39a4dac9a4e 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - es_MX - admin 
+# Dolibarr language file - Source file is en_US - admin
 Module30Name=Facturas y notas de crédito
 Module30Desc=Gestión de facturas y notas de crédito a clientes. Gestión facturas de proveedores
 BillsNumberingModule=Módulo de numeración de facturas y notas de crédito
diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index 877beecd423..4e81dca9011 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - es_PU - admin 
+# Dolibarr language file - Source file is en_US - admin
 Permission91=Consultar impuestos e IGV
 Permission92=Crear/modificar impuestos e IGV
 Permission93=Eliminar impuestos e IGV
diff --git a/htdocs/langs/es_PR/admin.lang b/htdocs/langs/es_PR/admin.lang
index f5906e9e162..ac75565a66b 100644
--- a/htdocs/langs/es_PR/admin.lang
+++ b/htdocs/langs/es_PR/admin.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - es_PR - admin 
+# Dolibarr language file - Source file is en_US - admin
 Permission91=Consultar impuestos e IVU
 Permission92=Crear/modificar impuestos e IVU
 Permission93=Eliminar impuestos e IVU
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index 26dd25027a2..c64e3933a2b 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -1,14 +1,11 @@
 # Dolibarr language file - Source file is en_US - accountancy
 Accounting=Contabilidade
 Globalparameters=Parametros globais
-Fiscalyear=Ano fiscal
 Menuaccount=Contas contábeis
 ConfigAccountingExpert=Configuração do módulo especialista em contabilidade
 Journaux=Jornais
 JournalFinancial=Jornais financeiros
-Exports=Exportações
 Selectmodelcsv=Escolha um modelo de exportação
-Modelcsv_normal=Exportação classica
 Modelcsv_CEGID=Export towards CEGID Expert
 BackToChartofaccounts=Return chart of accounts
 Back=Return
@@ -58,6 +55,10 @@ ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Codigo contavel padrao para compra de produtos
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Codigo contavel padrao para venda de produtos
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Codigo contavel padrao para compra de servicos
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Codigo contavel padrao para venda de serviços
 Docref=Referência
 Code_tiers=Cliente/Fornecedor
 Labelcompte=Label account
@@ -80,8 +81,6 @@ ListAccounts=List of the accounting accounts
 Pcgversion=Version of the plan
 Pcgtype=Class of account
 Pcgsubtype=Under class of account
-Active=Statement
-NewFiscalYear=New fiscal year
 DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover HT
 TotalMarge=Total sales margin
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 1211cf13d32..82d5c26f1bd 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -94,7 +94,6 @@ YouCanEditPHPTZ=Para definir um fuso horário diferente PHP (não obrigatório),
 OSEnv=OS Ambiente
 MaxNbOfLinesForBoxes=Numero de linhas máximo para as caixas
 PositionByDefault=Posição por padrao
-Position=Posição
 MenusDesc=Os configuradores do menu definem o conteúdo das 2 barras de menus (a barra horizontal e a barra vertical). É possível atribuir configuradores diferentes segundo o usuário seja interno ou externo.
 MenusEditorDesc=O editor de menus permite definir entradas personalizadas nos menus. Deve utilizar com prudência sobe pena de colocar o ERP numa situação instável sendo necessário uma reinstalação para encontrar um menu coerente.
 MenuForUsers=menu para os usuarios
@@ -103,7 +102,6 @@ SystemInfo=Informações de Sistema
 SystemTools=Ferramentas do Sistema
 SystemToolsArea=Área de ferramentas do sistema
 SystemToolsAreaDesc=Esta área oferece diferentes funções da administração. Use o menu para escolher a Funcionalidade que procura.
-Purge=Limpar
 PurgeAreaDesc=Esta página permite eliminar todos os arquivos criados ou guardados pelo ERP (Arquivos temporários ou todos os arquivos da pasta <b>%s</b>). O uso desta função não é necessária. Proporciona-se para os Usuários que albergam o ERP não servidor que oferece as permissões de eliminação de arquivos salvaguardados pela servidor Web.
 PurgeDeleteLogFile=Excluir arquivo de log <b>% s </ b> definido para o módulo Syslog (sem risco de perder dados)
 PurgeDeleteTemporaryFiles=Eliminar todos os arquivos temporários (sem perigo de perca de dados)
@@ -487,7 +485,6 @@ Permission1237=Pedidos a fornecedores Export e seus detalhes
 Permission1251=Execute as importações em massa de dados externos para o banco de dados (carga de dados)
 Permission1321=Exportar faturas a clientes, atributos e cobranças
 Permission1421=Exportar faturas de clientes e atributos
-Permission23001 =Ler tarefa agendada
 Permission23002 =Criar/atualizar tarefa agendada
 Permission23003 =Apagar tarefa agendada
 Permission2401=Ler ações (eventos ou tarefas) vinculadas na sua conta
@@ -541,7 +538,6 @@ LocalTax1IsUsed=Utilize segundo imposto
 LocalTax1IsNotUsed=Não use o segundo imposto
 LocalTax1IsUsedDesc=Use um segundo tipo de impostos (excepto o IVA)
 LocalTax1IsNotUsedDesc=Não use outro tipo de impostos (excepto o IVA)
-LocalTax1Management=Segundo tipo de imposto
 LocalTax2IsUsed=Use terceiro imposto
 LocalTax2IsNotUsed=Não use terceiro imposto
 LocalTax2IsUsedDesc=Use um terceiro tipo de impostos (excepto o VAT)
diff --git a/htdocs/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang
index e6bf3c55b2a..07a485a30f7 100644
--- a/htdocs/langs/pt_BR/agenda.lang
+++ b/htdocs/langs/pt_BR/agenda.lang
@@ -2,7 +2,6 @@
 IdAgenda=ID evento
 Actions=Eventos
 ActionsArea=Área de eventos (Atividades e Tarefas)
-LocalAgenda=Calendário interno
 ActionsOwnedBy=Evento de propriedade do
 DoneBy=Concluído por
 Event=Evento
diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang
index 90bb4e1584c..c111878d3d6 100644
--- a/htdocs/langs/pt_BR/banks.lang
+++ b/htdocs/langs/pt_BR/banks.lang
@@ -20,8 +20,6 @@ CurrentBalance=Saldo atual
 ShowAllTimeBalance=Mostrar Balanço Desde do Inicio
 AllTime=Do inicio
 RIB=Conta Bancaria
-StandingOrders=Débitos Diretos
-StandingOrder=Domicilio
 AccountStatement=Extrato da Conta
 AccountStatementShort=Extrato
 AccountStatements=Extratos das Contas
@@ -112,7 +110,6 @@ ThenCheckLinesAndConciliate=Verificar as linhas presentes no relatorio do banco
 BankDashboard=Somario de contas bancarias
 DefaultRIB=BAN padrao
 AllRIB=Todos BAN
-LabelRIB=Etiqueta BAN
 NoBANRecord=Nao tem registro BAN
 DeleteARib=Apagar registro BAN
 ConfirmDeleteRib=Voce tem certeza que quer apagar este registro BAN ?
diff --git a/htdocs/langs/pt_BR/boxes.lang b/htdocs/langs/pt_BR/boxes.lang
index c1e1dde6f55..1dfd31bd357 100644
--- a/htdocs/langs/pt_BR/boxes.lang
+++ b/htdocs/langs/pt_BR/boxes.lang
@@ -7,7 +7,6 @@ BoxOldestUnpaidSupplierBills=Primeira fatura pendentes do fornecedor
 BoxLastActions=Últimas ações
 BoxLastContracts=Últimos contratos
 BoxLastContacts=Últimos contatos/endereços
-BoxFicheInter=Últimas intervenções
 BoxCurrentAccounts=Abrir saldo das contas
 BoxTotalUnpaidCustomerBills=Total de faturas pendentes de clientes
 BoxTotalUnpaidSuppliersBills=Total de faturas pendentes de fornecedores
diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang
index 9ea64949849..539954acb35 100644
--- a/htdocs/langs/pt_BR/categories.lang
+++ b/htdocs/langs/pt_BR/categories.lang
@@ -43,11 +43,8 @@ CatCusLinks=Linkes entre clientes/prospetivas e categorias
 CatProdLinks=Linkes entre produtos/servicos e categorias
 CatMemberLinks=Linkes entre membros e categorias
 DeleteFromCat=Excluir da categoria
-DeletePicture=Apagar foto
-ConfirmDeletePicture=Confirmar eliminação de fotografias
 ExtraFieldsCategories=atributos complementares
 CategoriesSetup=Configuração de categorias
 CategorieRecursiv=Ligação com a categoria automaticamente
 CategorieRecursivHelp=Se ativado, o produto também será ligada a categoria original quando adicionando em uma subcategoria
 AddProductServiceIntoCategory=Adicione o seguinte produto / serviço
-ShowCategory=Mostrar categoria
diff --git a/htdocs/langs/pt_BR/commercial.lang b/htdocs/langs/pt_BR/commercial.lang
index 68b7321fe1b..e714cacf5f4 100644
--- a/htdocs/langs/pt_BR/commercial.lang
+++ b/htdocs/langs/pt_BR/commercial.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - commercial
 CommercialArea=Área Comercial
-CommercialCard=Ficha Comercial
 DeleteAction=Eliminar um evento/tarefa
 NewAction=Novo evento/tarefa
 AddAction=Criar evento/tarefa
diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang
index 7d3adf0d865..c730091cccb 100644
--- a/htdocs/langs/pt_BR/companies.lang
+++ b/htdocs/langs/pt_BR/companies.lang
@@ -22,7 +22,6 @@ Contacts=Contatos
 ThirdPartyContacts=Contatos de clientes/fornecedores
 ThirdPartyContact=Contato/Endereço de cliente/fornecedor
 StatusContactValidated=Estado do Contato
-CompanyName=Razão Social
 CountryIsInEEC=País da Comunidadeee Económica Europeia
 ThirdPartyName=Nome do cliente/fornecedor
 ThirdParty=Cliente/Fornecedor
@@ -56,7 +55,6 @@ LocalTax2IsUsedES=Sujeito a IRPF
 LocalTax2IsNotUsedES=Não sujeito a IRPF
 TypeLocaltax1ES=RE Tipo
 TypeLocaltax2ES=IRPF Tipo
-TypeES=Tipo
 WrongCustomerCode=Código cliente incorreto
 WrongSupplierCode=Código do fornecedor incorreto
 ProfId5Short=Prof. id 5
@@ -108,7 +106,6 @@ ContactsAddresses=Contatos/Enderecos
 NoContactDefinedForThirdParty=Nenhum contato definido para este cliente/fornecedor
 NoContactDefined=Nenhum contato definido
 DefaultContact=Contato por Padrao
-AddCompany=Criar empresa
 AddThirdParty=Criar cliente/fornecedor
 SupplierCode=Código do fornecedor
 SupplierAccount=Conta do fornecedor
diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang
index c50fcd7173d..d59bdbfeb77 100644
--- a/htdocs/langs/pt_BR/compta.lang
+++ b/htdocs/langs/pt_BR/compta.lang
@@ -133,10 +133,6 @@ CalculationRuleDesc=Para calcular o total do VAT, há dois métodos: <br> Métod
 CalculationRuleDescSupplier=De acordo com o fornecedor, escolher o método adequado aplicar mesma regra de cálculo e obter mesmo resultado esperado pelo seu fornecedor.
 TurnoverPerProductInCommitmentAccountingNotRelevant=Relatório Volume de negócios por produto, quando se usa um modo de <b>contabilidade de caixa</b> não é relevante. Este relatório está disponível somente quando utilizar o modo de <b>contabilidade engajamento</b> (ver configuração do módulo de contabilidade).
 AccountancyJournal=Codigo do jornal fiscal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Codigo contavel padrao para compra de produtos
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Codigo contavel padrao para venda de produtos
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Codigo contavel padrao para compra de servicos
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Codigo contavel padrao para venda de serviços
 ACCOUNTING_VAT_ACCOUNT=Codigo contavel padrao para credito VAT
 ACCOUNTING_VAT_BUY_ACCOUNT=Codigo contavel padrao para pagamento do VAT
 ACCOUNTING_ACCOUNT_CUSTOMER=Codigo contavel padrao para clientes
diff --git a/htdocs/langs/pt_BR/contracts.lang b/htdocs/langs/pt_BR/contracts.lang
index 33c7bf3054f..1ef7f2f6dc0 100644
--- a/htdocs/langs/pt_BR/contracts.lang
+++ b/htdocs/langs/pt_BR/contracts.lang
@@ -3,10 +3,7 @@ ContractsArea=Área Contratos
 ListOfContracts=Lista de Contratos
 AllContracts=Todos os Contratos
 ContractCard=Ficha Contrato
-ContractStatus=Estado do Contrato
 ContractStatusNotRunning=Fora de Serviço
-ContractStatusRunning=Em Serviço
-ContractStatusClosed=Encerrado
 ServiceStatusInitial=Inativo
 ServiceStatusRunning=Em Serviço
 ServiceStatusNotLate=Rodando, nao vencido
diff --git a/htdocs/langs/pt_BR/install.lang b/htdocs/langs/pt_BR/install.lang
index 0f356aad94d..c312f8dc18d 100644
--- a/htdocs/langs/pt_BR/install.lang
+++ b/htdocs/langs/pt_BR/install.lang
@@ -26,7 +26,6 @@ ErrorDatabaseAlreadyExists=Base de dados' %s' já existe.
 IfDatabaseNotExistsGoBackAndUncheckCreate=Se não existe base de dados, volte e verifique a opção "Criar uma base de dados".
 IfDatabaseExistsGoBackAndCheckCreate=Caso dados já existe, volte e desmarque "Criar uma base de dados" opção.
 WarningBrowserTooOld=Navegador antigo. Faça a atualizaçao do seu navegador para uma versao mais recente de Firefox, Chrome ou Opera, e altamente recomendado.
-YouCanContinue=Pode continuar...
 License=A usar licença
 ConfigurationFile=Arquivo de configuração
 WebPagesDirectory=Directoria onde armazenar as páginas web
@@ -34,13 +33,11 @@ DocumentsDirectory=Directoria onde armazenar documentos enviados e/ou gerados
 ForceHttps=Forcar conexoes seguras (https)
 CheckToForceHttps=Escolha esta opcao para forcar conexoes seguras (https).<br>Isto requere que o servidor web esta configurado para uso com certificado SSL.
 DolibarrDatabase=Base de dados Dolibarr
-Server=Servidor
 DatabasePrefix=Prefixo tabela banco de dados
 AdminLogin=Login para o administrador da base de dados Dolibarr. Deixar em branco se a conexão é feita com anônimo
 PasswordAgain=Introduza a password uma segunda vez
 AdminPassword=Password para o administrador da base de dados Dolibarr. Deixar em branco se a conexão é feita com anônimo
 CreateDatabase=Criar uma base de dados
-CreateUser=Criar usuário
 DatabaseSuperUserAccess=Base de dados - Acesso Superuser
 Experimental=(experimental, não operacional)
 KeepEmptyIfNoPassword=Deixar em branco se o usuário não tiver password
@@ -69,7 +66,6 @@ WarningRemoveInstallDir=Atenção, por razões de segurança, uma vez que a inst
 ThisPHPDoesNotSupportTypeBase=PHP Este sistema não suporta qualquer tipo de interface para acesso de dados %s
 DatabaseMigration=Estrutura migração de dados
 FreshInstall=Fresh instalar
-Upgrade=Upgrade
 UpgradeDesc=Use este modo se você tiver substituído Dolibarr antigos arquivos com arquivos de uma versão mais recente. Isto irá atualizar o seu banco de dados e dados.
 InstallNotAllowed=Instalação não permitidas pela <b>conf.php</b> permissões
 YouMustCreateWithPermission=Você deve criar o arquivo %s e definir permissões escrever sobre ele para instalar o servidor web durante o processo.
@@ -92,7 +88,6 @@ NextStepMightLastALongTime=O passo seguinte pode demorar alguns minutos. Por fav
 MigrationCustomerOrderShipping=Migrar espedicao para pedidos de cliente de armazenamento
 MigrationShippingDelivery=Atualizar armazenamento de espediçoes
 MigrationShippingDelivery2=Atualizar armazenamento de espediçao 2
-MigrationFinished=Migração terminada
 LastStepDesc=<strong>Ultimo passo</strong>: Defina aqui o usuario e a senha que voce planeja usar para conectar-se ao software. Nao perca estas credenciais, pois sao da conta que administra todas as outras contas.
 ActivateModule=Ativar modulo %s
 ShowEditTechnicalParameters=Clique aqui para mostrar/editar parametros avançados (modo avançado)
diff --git a/htdocs/langs/pt_BR/languages.lang b/htdocs/langs/pt_BR/languages.lang
index b6de66e3bb3..c922daac4f7 100644
--- a/htdocs/langs/pt_BR/languages.lang
+++ b/htdocs/langs/pt_BR/languages.lang
@@ -15,8 +15,6 @@ Language_en_IN=Ingles (India)
 Language_en_NZ=Ingles (Nova Zelandia)
 Language_en_SA=Ingles (Arabia Saudita)
 Language_en_US=Ingles (Estados Unidos)
-Language_es_DO=Espanhol (República Dominicana)
-Language_es_CL=Espanhol (Chile)
 Language_es_MX=Espanhol (Mexico)
 Language_et_EE=Estone
 Language_fa_IR=Persio
@@ -27,7 +25,6 @@ Language_fr_CH=Françes (Suiça)
 Language_fr_FR=Françes
 Language_he_IL=Ebreo
 Language_hu_HU=Ungeres
-Language_id_ID=Indonésio
 Language_is_IS=Islandes
 Language_ja_JP=Japones
 Language_nb_NO=Norveges (Bokmal)
diff --git a/htdocs/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang
index 71482c658bd..5dddd399559 100644
--- a/htdocs/langs/pt_BR/mails.lang
+++ b/htdocs/langs/pt_BR/mails.lang
@@ -12,8 +12,6 @@ Unsuscribe=Desenscrever
 MailingStatusNotContact=Nao contactar mais
 ErrorMailRecipientIsEmpty=A endereço do destinatário está vazia
 WarningNoEMailsAdded=nenhum Novo e-mail a Adicionar à lista destinatários.
-ConfirmResetMailing=Confirma a limpeza do mailing?
-NbOfRecipients=Número de destinatários
 NbOfUniqueEMails=N� de e-mails únicos
 NbOfEMails=N� de E-mails
 TotalNbOfDistinctRecipients=Número de destinatários únicos
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index be5e7c3b146..06cea34b38c 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -10,6 +10,7 @@ FormatDateShortJava=dd/MM/yyyy
 FormatDateShortJavaInput=dd/MM/yyyy
 FormatDateShortJQuery=dd/mm/yy
 FormatDateShortJQueryInput=dd/mm/yy
+FormatHourShortJQuery=HH:MI
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%b %d, %Y
@@ -18,7 +19,6 @@ FormatDateHourShort=%d/%m/%Y %I:%M %p
 FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
 FormatDateHourTextShort=%d %b, %Y, %I:%M %p
 FormatDateHourText=%d %B, %Y, %I:%M %p
-DatabaseConnection=Login à Base de Dados
 NoRecordFound=Registro nao encontrado
 NoError=Sem erro
 ErrorFieldFormat=O campo '%s' tem um valor incorreto
@@ -41,8 +41,6 @@ ErrorFailedToSaveFile=Erro, o registo do arquivo falhou.
 SelectDate=Selecionar uma data
 SeeAlso=Ver tambem %s
 BackgroundColorByDefault=Cor do fundo padrão
-FileNotUploaded=O arquivo nao foi carregado
-FileUploaded=O arquivo foi carregado com sucesso
 FileWasNotUploaded=O arquivo foi selecionado, mas nao foi ainda enviado. Clique no "Anexar arquivo" para proceder.
 NbOfEntries=Nr. de entradas
 GoToWikiHelpPage=Ler ajuda online ( necesita de acosso a internet)
@@ -69,10 +67,8 @@ PageWiki=Pagina wiki
 PeriodEndDate=Data final periodo
 Activate=Ativar
 Activated=Ativado
-Closed=Encerrado
 Closed2=Encerrado
 Enabled=Ativado
-Deprecated=Obsoleto
 Disable=Desativar
 Disabled=Desativado
 AddActionToDo=Adicionar ação a realizar
@@ -81,18 +77,14 @@ TestConnection=Teste a login
 ConfirmClone=Selecciones dados que deseja Cópiar.
 Go=Ir
 Run=Attivo
-SearchOf=Procurar
 Upload=Enviar Arquivo
-Select=Selecionar
 Resize=Modificar tamanho
 Recenter=Recolocar no centro
 User=Usuário
 Users=Usuário
-Password=Senha
 PasswordRetype=Repetir Senha
 NoteSomeFeaturesAreDisabled=Antenção, só poucos módulos/funcionalidade foram ativados nesta demo
 CurrentValue=Valor atual
-CurrentNote=Nota atual
 DefaultModel=Modelo Padrão
 Action=Ação
 NumberByMonth=Numero por mes
@@ -113,7 +105,6 @@ days=Dias
 Morning=Manha
 Quadri=Trimistre
 UseLocalTax=Incluindo taxa
-Tb=Tb
 Copy=Cópiar
 Default=Padrao
 DefaultValue=Valor por default
@@ -149,7 +140,6 @@ HT=Sem ICMS
 TTC=ICMS Incluido
 VAT=ICMS
 VATRate=Taxa ICMS
-FullList=Lista Completa
 OtherStatistics=Outras estatisticas
 Favorite=Favorito
 ShortInfo=Info.
@@ -173,12 +163,10 @@ RequestAlreadyDone=Pedido ja registrado
 GeneratedOn=Gerado a %s
 Available=Disponivel
 NotYetAvailable=Ainda não disponível
-NotAvailable=Não disponível
 to=para
 Drafts=Drafts
 ByUsers=Por usuário
 Preview=Preview
-Login=Login
 CurrentLogin=Login atual
 JanuaryMin=Jan
 FebruaryMin=Fev
@@ -249,7 +237,6 @@ CloneMainAttributes=Clonar o objeto com estes atributos
 PDFMerge=Fusão de PDF
 Merge=Fusão
 PrintContentArea=Mostrar pagina a se imprimir na area principal
-MenuManager=Administração do menu
 NoMenu=Sem sub-menu
 WarningYouAreInMaintenanceMode=Atenção, voce esta no modo de manutenção, somente o login <b>%s</b> tem permissões para uso da aplicação no momento.
 CoreErrorMessage=Occoreu erro. Verifique os arquivos de log ou contate seu administrador de sistema.
@@ -268,7 +255,6 @@ IM=Mensagems instantaneas
 AttributeCode=Codigo do atributo
 OptionalFieldsSetup=Configuração dos atributos extra
 URLPhoto=URL da photo/logo
-SetLinkToThirdParty=Atalho para outro terceiro
 CreateDraft=Criar RascunhoCriar rascunho
 SetToDraft=Voltar para modo rascunho
 ObjectDeleted=Objeto %s apagado
diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
index dbbed148c06..3f9ba3156d5 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -116,7 +116,6 @@ ImageEditor=Editor de imagems
 YouReceiveMailBecauseOfNotification=Voce recebeu esta mensagem porque o seu endereco de e-mail foi adicionado a lista de alvos a ser informados de algums eventos no %s software de %s.
 YouReceiveMailBecauseOfNotification2=Este evento e o seguinte:
 ThisIsListOfModules=Esta e a lista de modulos pre-seleçionados pelo profilo demo escolhido (somente os modulos mais comums são visiveis nesta demo). Para uma demo mais pesoalizada editar aqui e presionar "Inicio".
-ClickHere=Clickque aqui
 UseAdvancedPerms=Use as permissões avançadas de algums modulos
 FileFormat=Arquivo formato
 SelectAColor=Escolha a cor
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index a44226c4a38..d30c9cbbf8b 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -88,7 +88,6 @@ SuppliersPricesOfProductsOrServices=Preços (de produtos ou serviços) Fornecedo
 CustomCode=Codigo NCM
 CountryOrigin=Pais de origem
 HiddenIntoCombo=Escondido nas listas de seleções
-Nature=Tipo de produto
 ProductCodeModel=Modelo de ref. de produto
 ServiceCodeModel=Modelo de ref. de serviço
 AddThisProductCard=Criar ficha produto
diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
index 9c4a65dbfba..8b8a231b494 100644
--- a/htdocs/langs/pt_BR/projects.lang
+++ b/htdocs/langs/pt_BR/projects.lang
@@ -8,7 +8,6 @@ ProjectsDesc=Exibi todos os projetos (sua permissão de usuário lhe permite ver
 MyTasksDesc=Esta exibição é limitado a projetos ou tarefas que você é um contato (seja qual for o tipo).
 TasksPublicDesc=Essa exibição apresenta todos os projetos e tarefas que você tem permissão para ler.
 TasksDesc=Essa exibição apresenta todos os projetos e tarefas (suas permissões de usuário concede-lhe ver tudo).
-Myprojects=Os Meus Projetos
 AddProject=Criar projeto
 ConfirmDeleteAProject=Tem certeza que quer eliminar este projeto?
 ConfirmDeleteATask=Tem certeza que quer eliminar esta tarefa?
@@ -25,13 +24,10 @@ TaskTimeUser=Usuário
 NewTimeSpent=Novo Tempo Dedicado
 MyTimeSpent=O Meu Tempo Dedicado
 MyTasks=As minhas Tarefas
-TaskDateStart=Data de início da tarefa
 TaskDateEnd=Data final da tarefa
 AddTask=Criar tarefa
 AddDuration=Indicar Duração
-MyActivity=A Minha Atividade
 MyActivities=Minhas Tarefas/Atividades
-MyProjects=Os Meus Projetos
 ProgressDeclared=o progresso declarado
 ProgressCalculated=calculado do progresso
 ListOrdersAssociatedProject=Lista de Pedidos Associados ao Projeto
@@ -74,12 +70,8 @@ TaskModifiedInDolibarr=Tarefa %s alterada
 TaskDeletedInDolibarr=Tarefa %s excluída
 TypeContact_project_internal_PROJECTLEADER=Chefe de projeto
 TypeContact_project_external_PROJECTLEADER=Chefe de projeto
-TypeContact_project_internal_PROJECTCONTRIBUTOR=Colaborador
-TypeContact_project_external_PROJECTCONTRIBUTOR=Colaborador
 TypeContact_project_task_internal_TASKEXECUTIVE=Tarefa executada
 TypeContact_project_task_external_TASKEXECUTIVE=Tarefa executada
-TypeContact_project_task_internal_TASKCONTRIBUTOR=Colaborador
-TypeContact_project_task_external_TASKCONTRIBUTOR=Colaborador
 SelectElement=Selecionar componente
 AddElement=Link para componente
 UnlinkElement=Desligar elemento
diff --git a/htdocs/langs/pt_BR/resource.lang b/htdocs/langs/pt_BR/resource.lang
index ac5195cbe84..c3d6ec512c5 100644
--- a/htdocs/langs/pt_BR/resource.lang
+++ b/htdocs/langs/pt_BR/resource.lang
@@ -1,18 +1,10 @@
 # Dolibarr language file - Source file is en_US - resource
-MenuResourceIndex=Recursos
-MenuResourceAdd=Novo recurso
 MenuResourcePlanning=Planejamento de recurso
 DeleteResource=Remover recurso
 ConfirmDeleteResourceElement=Confirmar remoção do recurso para este elemento
-NoResourceInDatabase=Nenhum recurso na base de dados
 NoResourceLinked=Nenhum recurso vinculado
-ResourcePageIndex=Lista de recursos
-ResourceSingular=Recurso
 ResourceCard=Cartao recursos
 AddResource=Criar recurso
-ResourceFormLabel_ref=Nome do recurso
-ResourceType=Tipo de recurso
-ResourceFormLabel_description=Descrição do recurso
 ResourcesLinkedToElement=Recursos vinculados ao elemento
 ShowResourcePlanning=Mostrar planejamento do recurso
 GotoDate=Ir para data
@@ -23,5 +15,4 @@ TitleResourceCard=Cartao recurso
 ConfirmDeleteResource=Confirme para remover este recurso
 RessourceSuccessfullyDeleted=Recurso removido com sucesso
 DictionaryResourceType=Tipo de recurso
-DictionaryEMailTemplates=Modelos de Emails
 SelectResource=Selecionar recurso
diff --git a/htdocs/langs/pt_BR/users.lang b/htdocs/langs/pt_BR/users.lang
index 71a6fdf9790..d5ed0fe9de1 100644
--- a/htdocs/langs/pt_BR/users.lang
+++ b/htdocs/langs/pt_BR/users.lang
@@ -13,12 +13,9 @@ OwnedRights=As minhas permissões
 GroupRights=Permissões do grupo
 UserRights=Permissões do usuário
 UserGUISetup=Interface do usuário
-DisableUser=Desativar
 DisableAUser=Desativar um usuário
 DeleteUser=Excluir
 DeleteAUser=Excluir um usuário
-DisableGroup=Desativar
-DisableAGroup=Desativar um Grupo
 EnableAUser=Reativar um Usuário
 EnableAGroup=Reativar um Grupo
 DeleteGroup=Excluir
@@ -42,7 +39,6 @@ AdministratorDesc=Entidade do administrador
 DefaultRights=Permissões por Padrao
 DefaultRightsDesc=Defina aqui <u>padrão</u> permissões que são concedidas automaticamente para um <u>novo usuário criado</u> (Vá em fichas de usuário para alterar as permissões de um usuário existente).
 DolibarrUsers=Usuário Dolibarr
-LastName=Sobrenome
 FirstName=Primeiro nome
 ListOfGroups=Lista de grupos
 NewGroup=Novo grupo
@@ -74,7 +70,6 @@ LoginAccountDisableInDolibarr=A conta está desativada no Dolibarr
 LoginAccountDisableInLdap=A conta está desativada ao domínio
 ExportDataset_user_1=Usuários e Atributos
 DomainUser=Usuário de Domínio
-Reactivate=Reativar
 CreateInternalUserDesc=Este formulario permite criar um usuario interno a sua compania/fundação. Para criar um usuario externo (cliente, fornecedor, ...), use o botão 'Criar usuario Dolibarr' da ficha de contatos dos terceiro..
 InternalExternalDesc=Um usuário <b>interno</b> é um usuário que pertence à sua Empresa/Instituição.<br>Um usuário <b>externo</b> é um usuário cliente, fornecedor ou outro.<br><br>Nos 2 casos, as permissões de Usuários definem os direitos de acesso, mas o usuário externo pode além disso ter  um gerente de menus diferente do usuário interno (ver Inicio - configuração - visualização)
 PermissionInheritedFromAGroup=A permissão dá-se já que o herda de um grupo ao qual pertence o usuário.
@@ -100,5 +95,4 @@ HierarchicView=Visão hierárquica
 UseTypeFieldToChange=Use campo Tipo para mudar
 OpenIDURL=URL do OpenID
 LoginUsingOpenID=Usar o OpenID para efetuar o login
-WeeklyHours=Horas semanais
 ColorUser=Cor do usuario

From f09089380719f325f007fc7bf92c1890c0737cd6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Mar 2015 18:02:54 +0100
Subject: [PATCH 78/93] Hide a feature that is really not stable. So i move it
 as a "develop" feature.

---
 htdocs/admin/menus/other.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php
index 36733add335..9da251ccb66 100644
--- a/htdocs/admin/menus/other.php
+++ b/htdocs/admin/menus/other.php
@@ -120,7 +120,7 @@ print "</td>";
 print '</tr>';
 
 // Use a flip-hide menu
-if (isset($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL > 0)
+if (isset($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL > 1)
 {
 	$var=!$var;
 	print "<tr ".$bc[$var].">";

From ba2c0a2651ead307ab9c779a16e6b4dbdb424bea Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Mar 2015 20:27:54 +0100
Subject: [PATCH 79/93] Clean code of hooks. Extrafield index on fk_object must
 be unique.

---
 htdocs/core/class/extrafields.class.php        |  2 +-
 htdocs/core/class/hookmanager.class.php        | 17 ++++++++++-------
 htdocs/fourn/card.php                          |  2 ++
 htdocs/fourn/list.php                          | 18 +++++++++++++++++-
 htdocs/install/mysql/migration/3.7.0-3.8.0.sql |  4 ++++
 .../tables/llx_societe_extrafields.key.sql     |  2 +-
 6 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 24d8c40f5b3..7bebeb0b660 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -596,7 +596,7 @@ class ExtraFields
 					$this->attribute_pos[$tab->name]=$tab->pos;
 					$this->attribute_alwayseditable[$tab->name]=$tab->alwayseditable;
 					$this->attribute_perms[$tab->name]=$tab->perms;
-					$this->attribute_perms[$tab->name]=$tab->list;
+					$this->attribute_list[$tab->name]=$tab->list;
 				}
 			}
 		}
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 3ad0ec897f9..5cb0ca81faf 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -128,10 +128,8 @@ class HookManager
         $parameters['context']=join(':',$this->contextarray);
         dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
 
-        // Define type of hook ('output', 'returnvalue' or 'addreplace'). 'addreplace' should be type for all hooks. 'output' and 'returnvalue' are deprecated.
+        // Define type of hook ('output' or 'addreplace'. 'returnvalue' is deprecated).
         $hooktype='output';
-        if (preg_match('/^pdf_/',$method)) $hooktype='returnvalue';	// pdf_xxx except pdf_writelinedesc are returnvalue hooks. When there is 2 hooks of this type, only last one win.
-        if ($method =='insertExtraFields') $hooktype='returnvalue';
         if (in_array(
         	$method,
         	array(
@@ -149,6 +147,13 @@ class HookManager
         		'formatEvent'
         		)
         	)) $hooktype='addreplace';
+        // Deprecated hook types
+        if (preg_match('/^pdf_/',$method) && $method != 'pdf_writelinedesc') $hooktype='returnvalue';		// pdf_xxx except pdf_writelinedesc are 'returnvalue' hooks. When there is 2 hooks of this type, only last one win. TODO Move them into 'output' or 'addreplace' hooks.
+        if ($method == 'insertExtraFields')
+        {
+        	$hooktype='returnvalue';	// deprecated. TODO Remove all code with "executeHooks('insertExtraFields'" as soon as there is a trigger available.
+        	dol_syslog("Warning: The hook 'insertExtraFields' is deprecated and must not be used. Use instead trigger on CRUD event (ask it to dev team if not implemented)", LOG_WARNING);
+        }
 
         // Loop on each hook to qualify modules that have declared context
         $modulealreadyexecuted=array();
@@ -201,8 +206,6 @@ class HookManager
 
                     	if (! empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
                     	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
-                    	// TODO dead code to remove (do not enable this, but fix hook instead)
-                    	//if (is_array($result)) $this->resArray = array_merge($this->resArray, $result);
                     	// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string. we must use $actionclassinstance->resprints to return a string
                     	if (! is_array($result) && ! is_numeric($result))
                     	{
@@ -221,8 +224,8 @@ class HookManager
         }
 
         // TODO remove this. When there is something to print for an output hook, ->resPrint is filled.
-        if ($hooktype == 'output') return $this->resPrint;
-		if ($hooktype == 'returnvalue') return $result;
+        //if ($hooktype == 'output') return $this->resPrint;
+		//if ($hooktype == 'returnvalue') return $result;
         return ($error?-1:$resaction);
 	}
 
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index f94664531dd..1d4c144a098 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
 $langs->load('suppliers');
@@ -49,6 +50,7 @@ if ($user->societe_id) $id=$user->societe_id;
 $result = restrictedArea($user, 'societe&fournisseur', $id, '&societe');
 
 $object = new Fournisseur($db);
+$extrafields = new ExtraFields($db);
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('suppliercard','globalcard'));
diff --git a/htdocs/fourn/list.php b/htdocs/fourn/list.php
index b0d7caf8695..4c16f3a1d61 100644
--- a/htdocs/fourn/list.php
+++ b/htdocs/fourn/list.php
@@ -27,6 +27,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 $langs->load("suppliers");
 $langs->load("orders");
@@ -59,6 +60,7 @@ if (! $sortfield) $sortfield="nom";
 
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('supplierlist'));
+$extrafields = new ExtraFields($db);
 
 if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers
 {
@@ -73,6 +75,9 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both
 	$catid="";
 }
 
+$extrafields->fetch_name_optionals_label('thirdparty');
+
+
 /*
  * 	Actions
  */
@@ -95,7 +100,14 @@ llxHeader('',$langs->trans("ThirdParty"),$help_url);
 $sql = "SELECT s.rowid as socid, s.nom as name, s.zip, s.town, s.datec, st.libelle as stcomm, s.prefix_comm, s.status as status, ";
 $sql.= "code_fournisseur, code_compta_fournisseur";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
+// Add fields for extrafields
+foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key;
+// Add fields from hooks
+$parameters=array();
+$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as ef ON ef.fk_object = s.rowid";
 if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cf ON s.rowid = cf.fk_societe"; // We need this table joined to the select in order to filter by categ
 $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -122,6 +134,9 @@ if ($catid > 0)          $sql.= " AND cf.fk_categorie = ".$catid;
 if ($catid == -2)        $sql.= " AND cf.fk_categorie IS NULL";
 if ($search_categ > 0)   $sql.= " AND cf.fk_categorie = ".$search_categ;
 if ($search_categ == -2) $sql.= " AND cf.fk_categorie IS NULL";
+// Add where from hooks
+$parameters=array();
+$sql.=$hookmanager->executeHooks('printFieldListWhere',$parameters);    // Note that $action and $object may have been modified by hook
 // Count total nb of records
 $nbtotalofrecords = 0;
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
@@ -131,6 +146,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 }
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($conf->liste_limit+1, $offset);
+//print $sql;
 
 dol_syslog('fourn/list.php:', LOG_DEBUG);
 $resql = $db->query($sql);
@@ -200,7 +216,7 @@ if ($resql)
 	print '<td class="liste_titre" align="right"><input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 	print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"),'searchclear.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
     print "</td></tr>\n";
-	
+
 	$parameters=array();
 	$formconfirm=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
 
diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index 65273632998..73ace187708 100755
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -366,3 +366,7 @@ INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('CIP', 'Carriage and
 INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DAT', 'Delivered At Terminal, marchandises (déchargées) livrées sur quai, dans un terminal maritime, fluvial, aérien, routier ou ferroviaire désigné (dédouanement import, et post-acheminement payés par l''acheteur)', 1);
 INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DAP', 'Delivered At Place, marchandises (non déchargées) mises à disposition de l''acheteur dans le pays d''importation au lieu précisé dans le contrat (déchargement, dédouanement import payé par l''acheteur)', 1);
 INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DDP', 'Delivered Duty Paid, marchandises (non déchargées) livrées à destination finale, dédouanement import et taxes à la charge du vendeur ; l''acheteur prend en charge uniquement le déchargement (si exclusion des taxes type TVA, le préciser clairement)', 1);
+
+-- Extrafields fk_object must be unique (1-1 relation)
+ALTER TABLE llx_societe_extrafields DROP INDEX idx_societe_extrafields
+ALTER TABLE llx_societe_extrafields ADD UNIQUE INDEX uk_societe_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql
index 44ce4dda753..9d89beebd37 100644
--- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql
@@ -17,4 +17,4 @@
 -- ===================================================================
 
 
-ALTER TABLE llx_societe_extrafields ADD INDEX idx_societe_extrafields (fk_object);
+ALTER TABLE llx_societe_extrafields ADD UNIQUE INDEX uk_societe_extrafields (fk_object);

From 50b09fa8a97ba85725c5aaeb509a32a19f51f04c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 13 Mar 2015 21:39:39 +0100
Subject: [PATCH 80/93] Doxygen

---
 htdocs/product/class/product.class.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 910f5b316cd..02686a94f03 100755
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2650,10 +2650,11 @@ class Product extends CommonObject
 	 *  Fonction recursive uniquement utilisee par get_arbo_each_prod, recompose l'arborescence des sousproduits
 	 * 	Define value of this->res
 	 *
-	 *	@param		array	$prod			Products array
-	 *	@param		string	$compl_path		Directory path of parents to add before
-	 *	@param		int		$multiply		Because each sublevel must be multiplicated by parent nb
-	 *	@param		int		$level			Init level
+	 *	@param		array		$prod			Products array
+	 *	@param		string		$compl_path		Directory path of parents to add before
+	 *	@param		int			$multiply		Because each sublevel must be multiplicated by parent nb
+	 *	@param		int			$level			Init level
+	 *  @param		int			$id_parent		Id parent
 	 *  @return 	void
 	 */
 	function fetch_prod_arbo($prod, $compl_path="", $multiply=1, $level=1, $id_parent=0)

From 971f9b0c30bbd01a79a15da9adf81036f8a070dd Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Fri, 13 Mar 2015 22:08:24 +0100
Subject: [PATCH 81/93] Fix: Migration script

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

diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index 73ace187708..b7475d88f91 100755
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -368,5 +368,5 @@ INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DAP', 'Delivered At
 INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DDP', 'Delivered Duty Paid, marchandises (non déchargées) livrées à destination finale, dédouanement import et taxes à la charge du vendeur ; l''acheteur prend en charge uniquement le déchargement (si exclusion des taxes type TVA, le préciser clairement)', 1);
 
 -- Extrafields fk_object must be unique (1-1 relation)
-ALTER TABLE llx_societe_extrafields DROP INDEX idx_societe_extrafields
+ALTER TABLE llx_societe_extrafields DROP INDEX idx_societe_extrafields;
 ALTER TABLE llx_societe_extrafields ADD UNIQUE INDEX uk_societe_extrafields (fk_object);

From a63b1cf4c30c2fa124fc5f227a250c5726ee0c55 Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sat, 14 Mar 2015 09:57:28 +0100
Subject: [PATCH 82/93] Fix: Showing system error if not enough stock of
 product into orders creation with lines

Conflicts:
	htdocs/commande/class/commande.class.php
---
 ChangeLog                                |  1 +
 htdocs/commande/class/commande.class.php | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e250846ffe1..60521f04c81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -234,6 +234,7 @@ Dolibarr better:
 - Fix: [ bug #1790 ] Email form behaves in an unexpected way when pressing Enter key
 - Fix: Bad SEPA xml file creation
 - Fix: [ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment
+- Fix: Showing system error if not enough stock of product into orders creation with lines
 
 ***** ChangeLog for 3.6.2 compared to 3.6.1 *****
 - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice.
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 3402999b350..8dcaca59a97 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2014 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
- * Copyright (C) 2010-2014 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2010-2015 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2011      Jean Heimburger      <jean@tiaris.info>
  * Copyright (C) 2012-2014 Christophe Battarel  <christophe.battarel@altairis.fr>
  * Copyright (C) 2013      Florian Henry		<florian.henry@open-concept.pro>
@@ -110,6 +110,11 @@ class Commande extends CommonOrder
 	var $fk_incoterms;
 	var $location_incoterms;
 	var $libelle_incoterms;  //Used into tooltip
+    
+     /**
+     * ERR Not engouch stock
+     */
+    const STOCK_NOT_ENOUGH_FOR_ORDER = -3;
 
 
     /**
@@ -752,8 +757,11 @@ class Commande extends CommonOrder
                     );
                     if ($result < 0)
                     {
-                        $this->error=$this->db->lasterror();
-                        dol_print_error($this->db);
+                    	if ($result != self::STOCK_NOT_ENOUGH_FOR_ORDER)
+                    	{
+                        	$this->error=$this->db->lasterror();
+                        	dol_print_error($this->db);
+                    	}
                         $this->db->rollback();
                         return -1;
                     }
@@ -1192,10 +1200,12 @@ class Commande extends CommonOrder
 				$result=$product->fetch($fk_product);
 				$product_type=$product->type;
 
-				if($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER && $product_type == 0 && $product->stock_reel < $qty) {
+				if($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER && $product_type == 0 && $product->stock_reel < $qty)
+				{
 					$this->error=$langs->trans('ErrorStockIsNotEnough');
+					dol_syslog(get_class($this)."::addline error=Product ".$product->ref.": ".$this->error, LOG_ERR);
 					$this->db->rollback();
-					return -3;
+					return self::STOCK_NOT_ENOUGH_FOR_ORDER;
 				}
 			}
 

From a2adeb28073d06f6963e4b187d408b974ef95d1f Mon Sep 17 00:00:00 2001
From: Juanjo Menent <jmenent@2byte.es>
Date: Sat, 14 Mar 2015 10:16:50 +0100
Subject: [PATCH 83/93] Fix: [ bug #1836 ] Required parameter missing in
 Rejetprelevement line 159

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

diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index 176a561378b..2ef37c29e18 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -156,7 +156,7 @@ class RejetPrelevement
 			}
 			else
 			{
-				$result=$pai->addPaymentToBank($user,'payment','(InvoiceRefused)',$bankaccount);
+				$result=$pai->addPaymentToBank($user,'payment','(InvoiceRefused)',$bankaccount,'','');
 				if ($result < 0)
 				{
 					dol_syslog("RejetPrelevement::Create AddPaymentToBan Error");

From 41a05bc4bad8260d01796beecadeae92e80cc40a Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Sat, 14 Mar 2015 12:04:00 +0100
Subject: [PATCH 84/93] Update actions_extrafields.inc.php

add new type of extrafields "link" : linked to dolibarr element
---
 htdocs/core/actions_extrafields.inc.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index d5f8ea7c18c..03d724b9bba 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -80,6 +80,13 @@ if ($action == 'add')
         	$mesg[]=$langs->trans("ErrorNoValueForCheckBoxType");
         	$action = 'create';
         }
+        if (GETPOST('type')=='link' && !GETPOST('param'))
+        {
+        	$error++;
+        	$langs->load("errors");
+        	$mesg[]=$langs->trans("ErrorNoValueForLinkType");
+        	$action = 'create';
+        }
         if (GETPOST('type')=='radio' && !GETPOST('param'))
         {
         	$error++;

From df9f822a705968e57349ad487eab910dfeabfa16 Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Sat, 14 Mar 2015 12:25:17 +0100
Subject: [PATCH 85/93] Update commonobject.class.php

new extafields type
---
 htdocs/core/class/commonobject.class.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 36101e4b081..a316c3cd511 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3624,6 +3624,7 @@ abstract class CommonObject
                	$attributeType  = $extrafields->attribute_type[$attributeKey];
                	$attributeSize  = $extrafields->attribute_size[$attributeKey];
                	$attributeLabel = $extrafields->attribute_label[$attributeKey];
+               	$attributeParam = $extrafields->attribute_param[$attributeKey];  
                	switch ($attributeType)
                	{
                		case 'int':
@@ -3646,6 +3647,19 @@ abstract class CommonObject
             		case 'datetime':
             			$this->array_options[$key]=$this->db->idate($this->array_options[$key]);
             			break;
+           		case 'link':
+				$param_list=array_keys($attributeParam ['options']);
+				// 0 : ObjectName
+				// 1 : classPath
+				$InfoFieldList = explode(":", $param_list[0]);
+				dol_include_once($InfoFieldList[1]);
+				$object = new $InfoFieldList[0]($this->db);
+				if ($value)
+				{
+					$object->fetch(0,$value);
+					$this->array_options[$key]=$object->id;
+				}
+				break;
                	}
             }
             $this->db->begin();

From 0aa236069193adc9e0704153ed25edaafd80c7f2 Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Sat, 14 Mar 2015 12:31:22 +0100
Subject: [PATCH 86/93] Update extrafields.class.php

add new extrafields type 'link'
---
 htdocs/core/class/extrafields.class.php | 36 +++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 7bebeb0b660..361c14319eb 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2009-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2009-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2013	   Florian Henry        <forian.henry@open-concept.pro>
+ * Copyright (C) 2015	   Charles-Fr BENKE     <charles.fr@benke.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
@@ -77,6 +78,7 @@ class ExtraFields
 	'checkbox' => 'ExtrafieldCheckBox',
 	'radio' => 'ExtrafieldRadio',
 	'chkbxlst' => 'ExtrafieldCheckBoxFromList',
+	'link' => 'ExtrafieldLink',
 	);
 
 	/**
@@ -187,6 +189,9 @@ class ExtraFields
 			} elseif (($type=='select') || ($type=='sellist') || ($type=='radio') ||($type=='checkbox') ||($type=='chkbxlst')){
 				$typedb='text';
 				$lengthdb='';
+			} elseif ($type=='link') {
+				$typedb='int';
+				$lengthdb='11';
 			} else {
 				$typedb=$type;
 				$lengthdb=$length;
@@ -404,6 +409,9 @@ class ExtraFields
 			} elseif (($type=='select') || ($type=='sellist') || ($type=='radio') || ($type=='checkbox') || ($type=='chkbxlst')) {
 				$typedb='text';
 				$lengthdb='';
+			} elseif ($type=='link') {
+				$typedb='int';
+				$lengthdb='11';
 			} else {
 				$typedb=$type;
 				$lengthdb=$length;
@@ -1043,6 +1051,19 @@ class ExtraFields
 			}
 			$out .= '</select>';
 		}
+		elseif ($type == 'link')
+		{
+			$out='';
+			$param_list=array_keys($param['options']);
+			// 0 : ObjectName
+			// 1 : classPath
+			$InfoFieldList = explode(":", $param_list[0]);
+			dol_include_once($InfoFieldList[1]);
+			$object = new $InfoFieldList[0]($this->db);
+			$object->fetch($value);
+			$out='<input type="text" class="flat" name="options_'.$key.$keyprefix.'"  size="20" value="'.$object->ref.'" >';
+		
+		}
 		/* Add comments
 		 if ($type == 'date') $out.=' (YYYY-MM-DD)';
 		elseif ($type == 'datetime') $out.=' (YYYY-MM-DD HH:MM:SS)';
@@ -1268,6 +1289,21 @@ class ExtraFields
 			} else
 				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
 		}
+		elseif ($type == 'link')
+		{
+			$out='';
+			$param_list=array_keys($params['options']);
+			// 0 : ObjectName
+			// 1 : classPath
+			$InfoFieldList = explode(":", $param_list[0]);
+			dol_include_once($InfoFieldList[1]);
+			$object = new $InfoFieldList[0]($this->db);
+			if ($value)
+			{
+				$object->fetch($value);
+				$value=$object->getNomUrl(3);
+			}
+		}
 		else
 		{
 			$showsize=round($size);

From 4783db82ac034eba9d7a13e004a89197d5d497d2 Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Sat, 14 Mar 2015 12:42:52 +0100
Subject: [PATCH 87/93] Update admin_extrafields_add.tpl.php

new type of extrafield : link
---
 htdocs/core/tpl/admin_extrafields_add.tpl.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 1f61064183b..72eddc012d2 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -48,6 +48,7 @@
     		else if (type == 'boolean') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
     		else if (type == 'price') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
     		else if (type == 'select') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();}
+    		else if (type == 'link') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();}
     		else if (type == 'sellist') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").show();jQuery("#helpchkbxlst").hide();}
     		else if (type == 'checkbox') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();}
     		else if (type == 'radio') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled');  jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();}

From 9e62013bcadddec54ef66ed8c779fe03f6be3aa1 Mon Sep 17 00:00:00 2001
From: BENKE Charles <charles.fr@benke.fr>
Date: Sat, 14 Mar 2015 12:44:26 +0100
Subject: [PATCH 88/93] Update admin_extrafields_edit.tpl.php

add new type of extrafields : link
---
 htdocs/core/tpl/admin_extrafields_edit.tpl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 13a6486aa4f..76713be57df 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -68,7 +68,7 @@ if((($type == 'select') || ($type == 'checkbox') || ($type == 'radio')) && is_ar
 		}
 	}
 }
-elseif (($type== 'sellist') || ($type == 'chkbxlst'))
+elseif (($type== 'sellist') || ($type == 'chkbxlst') || ($type == 'link') )
 {
 	$paramlist=array_keys($param['options']);
 	$param_chain = $paramlist[0];

From 2a09e34bdf068e793be9b86ab2f4f6eeec22c484 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 14 Mar 2015 13:05:28 +0100
Subject: [PATCH 89/93] Uniformize etrafields visibility for thirdparties card

---
 htdocs/comm/card.php   | 20 +++++++++++++++++---
 htdocs/fourn/card.php  | 15 ++++++++++++++-
 htdocs/societe/soc.php | 20 +++++++++++---------
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 78b786d2366..9b7c3150c71 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -68,10 +68,15 @@ if (! $sortorder) $sortorder="ASC";
 if (! $sortfield) $sortfield="nom";
 $cancelbutton = GETPOST('cancel');
 
+$object = new Client($db);
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('commcard','globalcard'));
 
-$object = new Societe($db);
 
 /*
  * Actions
@@ -425,9 +430,9 @@ if ($id > 0)
 		print '</tr>';
 	}
 
-	// Level of prospect
 	if ($object->client == 2 || $object->client == 3)
 	{
+		// Level of prospect
 		print '<tr><td class="nowrap">';
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans('ProspectLevel');
@@ -453,7 +458,16 @@ if ($id > 0)
 		print '</td></tr>';
 	}
 
-	// Sales representative
+	// Other attributes
+	$parameters=array('socid'=>$object->id, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
+	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	{
+		print $object->showOptionals($extrafields);
+	}
+
+    // Sales representative
 	include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
 
     // Module Adherent
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 1d4c144a098..1825349e83b 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -52,9 +52,13 @@ $result = restrictedArea($user, 'societe&fournisseur', $id, '&societe');
 $object = new Fournisseur($db);
 $extrafields = new ExtraFields($db);
 
+// fetch optionals attributes and labels
+$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+
 // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('suppliercard','globalcard'));
 
+
 /*
  * Action
  */
@@ -253,7 +257,16 @@ if ($object->id > 0)
 	print "</td>";
 	print '</tr>';
 
-    // Module Adherent
+	// Other attributes
+	$parameters=array('socid'=>$object->id, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
+	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	if (empty($reshook) && ! empty($extrafields->attribute_label))
+	{
+		print $object->showOptionals($extrafields);
+	}
+
+	// Module Adherent
     if (! empty($conf->adherent->enabled))
     {
         $langs->load("members");
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 0f17851b89e..84b47983d5c 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -63,6 +63,10 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
 
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('thirdpartycard','globalcard'));
+
+
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
 $object->getCanvas($socid);
 $canvas = $object->canvas?$object->canvas:GETPOST("canvas");
@@ -77,8 +81,6 @@ if (! empty($canvas))
 // Security check
 $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
-$hookmanager->initHooks(array('thirdpartycard','globalcard'));
 
 
 /*
@@ -1091,7 +1093,7 @@ else
             $form->select_users((! empty($object->commercial_id)?$object->commercial_id:$user->id),'commercial_id',1); // Add current user by default
             print '</td></tr>';
         }
-		
+
 		// Incoterms
 		if (!empty($conf->incoterm->enabled))
 		{
@@ -1101,7 +1103,7 @@ else
 	        print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''));
 			print '</td></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
@@ -1226,11 +1228,11 @@ else
 
 				//Incoterms
 				if (!empty($conf->incoterm->enabled))
-				{	
+				{
 					$object->fk_incoterms			= GETPOST('incoterm_id', 'int');
 					$object->location_incoterms		= GETPOST('lcoation_incoterms', 'alpha');
 				}
-				
+
                 //Local Taxes
                 $object->localtax1_assuj		= GETPOST('localtax1assuj_value');
                 $object->localtax2_assuj		= GETPOST('localtax2assuj_value');
@@ -1627,7 +1629,7 @@ else
 	            print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''));
 				print '</td></tr>';
 			}
-			
+
             // Logo
             print '<tr class="hideonsmartphone">';
             print '<td><label for="photoinput">'.$langs->trans("Logo").'</label></td>';
@@ -2016,7 +2018,7 @@ else
 
 		// Incoterms
 		if (!empty($conf->incoterm->enabled))
-		{			
+		{
 			print '<tr><td>';
             print '<table width="100%" class="nobordernopadding"><tr><td>';
             print $langs->trans('IncotermLabel');
@@ -2030,7 +2032,7 @@ else
 			{
 				print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
 			}
-			else 
+			else
 			{
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?socid='.$object->id);
 			}

From 306eff62ad4c8a03d0b3572ae768a321e5493b04 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 14 Mar 2015 13:23:36 +0100
Subject: [PATCH 90/93] NEW: Show last official stable version into system -
 update page.

---
 htdocs/admin/tools/update.php | 54 +++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index e12ef58cebf..7c85f820eab 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -24,6 +24,7 @@
 
 require '../../main.inc.php';
 include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+include_once DOL_DOCUMENT_ROOT . '/core/lib/geturl.lib.php';
 
 $langs->load("admin");
 $langs->load("other");
@@ -105,28 +106,39 @@ llxHeader('',$langs->trans("Upgrade"),$wikihelp);
 print_fiche_titre($langs->trans("Upgrade"),'','setup');
 
 print $langs->trans("CurrentVersion").' : <b>'.DOL_VERSION.'</b><br>';
-if ($sfurl = simplexml_load_file('http://sourceforge.net/projects/dolibarr/rss')) {
-    $title=$sfurl->channel[0]->item[0]->title;
-function word_limiter( $text, $limit = 30, $chars = '0123456789.' ) {
-    if( strlen( $text ) > $limit ) {
-        $words = str_word_count( $text, 2, $chars );
-        $words = array_reverse( $words, TRUE );
-        foreach( $words as $length => $word ) {
-            if( $length + strlen( $word ) >= $limit ) {
-                array_shift( $words );
-            } else {
-                break;
-            }
-        }
-        $words = array_reverse( $words );
-        $text = implode( " ", $words ) . '';
-    }
-    return $text;
-}
 
-$str = $title;
-print $langs->trans("LastStableVersion").' : <b>'. word_limiter( $str ).'</b><br>';
-} else {
+$result = getURLContent('http://sourceforge.net/projects/dolibarr/rss');
+//var_dump($result['content']);
+$sfurl = simplexml_load_string($result['content']);
+if ($sfurl)
+{
+    $title=$sfurl->channel[0]->item[0]->title;
+
+	function word_limiter($text, $limit = 30, $chars = '0123456789.')
+	{
+	    if (strlen( $text ) > $limit)
+	    {
+	        $words = str_word_count($text, 2, $chars);
+	        $words = array_reverse($words, TRUE);
+	        foreach($words as $length => $word) {
+	            if ($length + strlen( $word ) >= $limit)
+	            {
+	                array_shift($words);
+	            } else {
+	                break;
+	            }
+	        }
+	        $words = array_reverse($words);
+	        $text = implode(" ", $words) . '';
+	    }
+	    return $text;
+	}
+
+	$str = $title;
+	print $langs->trans("LastStableVersion").' : <b>'. word_limiter( $str ).'</b><br>';
+}
+else
+{
     print $langs->trans("LastStableVersion").' : <b>' .$langs->trans("UpdateServerOffline").'</b><br>';
 }
 print '<br>';

From 44d6bdb1c5fb354adfea96f2a0911e72c31ed176 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 14 Mar 2015 14:27:45 +0100
Subject: [PATCH 91/93] Doc

---
 htdocs/install/mysql/tables/llx_commande.sql             | 4 ++--
 htdocs/install/mysql/tables/llx_commande_fournisseur.sql | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql
index 90e8fd7af71..7bf22df1a1d 100644
--- a/htdocs/install/mysql/tables/llx_commande.sql
+++ b/htdocs/install/mysql/tables/llx_commande.sql
@@ -40,7 +40,7 @@ create table llx_commande
   fk_user_modif         integer,                       -- user making last change
   fk_user_valid			integer,						-- user validating
   fk_user_cloture		integer,						-- user closing
-  source				smallint,
+  source				smallint,						-- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ?
   fk_statut				smallint  default 0,
   amount_ht				real      default 0,
   remise_percent		real      default 0,
@@ -64,7 +64,7 @@ create table llx_commande
   date_livraison		date 	  default NULL,
   fk_shipping_method    integer,                        -- shipping method id
   fk_availability		integer NULL,
-  fk_input_reason		integer,
+  fk_input_reason		integer,						-- id coming from c_input_reason, '0' if no defined
   fk_delivery_address	integer,						-- delivery address (deprecated)
   import_key			varchar(14),
   extraparams			varchar(255)					-- for stock other parameters with json format
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
index f9f440d0db4..17027e16960 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
@@ -41,7 +41,7 @@ create table llx_commande_fournisseur
   fk_user_modif         integer,                       -- user making last change
   fk_user_valid			integer,                       -- user validating
   fk_user_approve		integer,                       -- user approving
-  source				smallint NOT NULL,
+  source				smallint NOT NULL,			-- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ?
   fk_statut				smallint  default 0,
   amount_ht				real      default 0,
   remise_percent		real      default 0,
@@ -59,7 +59,7 @@ create table llx_commande_fournisseur
   fk_account            integer,                       -- bank account
   fk_cond_reglement		integer,                       -- condition de reglement
   fk_mode_reglement		integer,                       -- mode de reglement
-  fk_input_method	    integer default 0,
+  fk_input_method	    integer default 0,            -- id coming from c_input_reason, '0' if no defined
   import_key			varchar(14),
   extraparams			varchar(255)					-- for stock other parameters with json format
   

From cbacfa313731665b5676c1f79207cd61915e9643 Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Sat, 14 Mar 2015 13:30:19 +0000
Subject: [PATCH 92/93] Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
 htdocs/categories/class/categorie.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index e4ff0e4e0d1..63aab39f6f8 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1000,7 +1000,7 @@ class Categorie extends CommonObject
 	/**
 	 * 	Check if no category with same label already exists for this cat's parent or root and for this cat's type
 	 *
-	 * 	@return		boolean		1 if already exist, 0 otherwise, -1 if error
+	 * 	@return		integer		1 if already exist, 0 otherwise, -1 if error
 	 */
 	function already_exists()
 	{

From 10bbf463e7c91df3deb44207e186475ef04f9401 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 14 Mar 2015 14:55:41 +0100
Subject: [PATCH 93/93] Several bug fixes from scrutinizer

---
 htdocs/admin/system/dolibarr.php            |  2 +-
 htdocs/categories/class/categorie.class.php | 31 ++-------------------
 htdocs/commande/list.php                    |  6 ++--
 htdocs/core/class/commonobject.class.php    | 27 +++++++++++++++++-
 htdocs/core/lib/date.lib.php                |  1 +
 htdocs/core/lib/functions.lib.php           |  2 +-
 htdocs/product/class/product.class.php      | 27 ++----------------
 7 files changed, 36 insertions(+), 60 deletions(-)

diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 96700ba1e16..4ec093dfafc 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -179,7 +179,7 @@ $c=getServerTimeZoneInt('summer');
 $daylight=(is_numeric($c) && is_numeric($b))?round($c-$b):'unknown';
 //print $a." ".$b." ".$c." ".$daylight;
 $val=($a>=0?'+':'').$a;
-$val.=' ('.($a==='unknown'?'unknown':($a>=0?'+':'').($a*3600)).')';
+$val.=' ('.($a=='unknown'?'unknown':($a>=0?'+':'').($a*3600)).')';
 $val.=' &nbsp; &nbsp; &nbsp; '.getServerTimeZoneString();
 $val.=' &nbsp; &nbsp; &nbsp; '.$langs->trans("DaylingSavingTime").': '.($daylight==='unknown'?'unknown':($a==$c?yn($daylight):yn(0).($daylight?'  &nbsp; &nbsp; ('.$langs->trans('YesInSummer').')':'')));
 print $form->textwithtooltip($val,$txt,2,1,img_info(''));
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index e4ff0e4e0d1..5d64b7d9327 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1295,11 +1295,9 @@ class Categorie extends CommonObject
 	 *
 	 *  @param      string	$sdir       Repertoire destination finale
 	 *  @param      string	$file		Nom du fichier uploade
-	 *  @param      int		$maxWidth   Largeur maximum que dois faire la miniature (160 par defaut)
-	 *  @param      int		$maxHeight  Hauteur maximum que dois faire la miniature (120 par defaut)
 	 *	@return		void
 	 */
-	function add_photo($sdir, $file, $maxWidth = 160, $maxHeight = 120)
+	function add_photo($sdir, $file)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -1321,36 +1319,11 @@ class Categorie extends CommonObject
 			if (file_exists($originImage))
 			{
 				// Cree fichier en taille vignette
-				$this->add_thumb($originImage,$maxWidth,$maxHeight);
+				$this->add_thumb($originImage);
 			}
 		}
 	}
 
-	/**
-	 *  Build thumb
-	 *
-	 *  @param      string	$file           Chemin du fichier d'origine
-	 *	@return		void
-	 */
-	function add_thumb($file)
-	{
-		global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini, $quality;
-
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';		// This define also $maxwidthsmall, $quality, ...
-
-		if (file_exists($file))
-		{
-			// Create small thumbs for company (Ratio is near 16/9)
-	        // Used on logon for example
-	        $imgThumbSmall = vignette($file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
-
-	        // Create mini thumbs for company (Ratio is near 16/9)
-	        // Used on menu or for setup page for example
-	        $imgThumbMini = vignette($file, $maxwidthmini, $maxheightmini, '_mini', $quality);
-		}
-	}
-
-
 	/**
 	 *    Return tableau de toutes les photos de la categorie
 	 *
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index c38b1a8e34f..e51ded5e297 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -259,7 +259,7 @@ if ($resql)
 	if ($search_user > 0) 		$param.='&search_user='.$search_user;
 	if ($search_sale > 0) 		$param.='&search_sale='.$search_sale;
 	if ($search_total_ht != '') $param.='&search_total_ht='.$search_total_ht;
-	
+
 	$num = $db->num_rows($resql);
 	print_barre_liste($title, $page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
 	$i = 0;
@@ -337,7 +337,7 @@ if ($resql)
 
     $generic_commande = new Commande($db);
     $generic_product = new Product($db);
-    while ($i < min($num,$limit)) 
+    while ($i < min($num,$limit))
     {
         $objp = $db->fetch_object($resql);
         $var=!$var;
@@ -368,7 +368,7 @@ if ($resql)
                     $nbprod++; // order contains real products
                     $generic_product->id = $generic_commande->lines[$lig]->fk_product;
                     if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product])) {
-                        $generic_product->load_stock(true);
+                        $generic_product->load_stock();
                         $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_reel;
                     } else {
                         $generic_product->stock_reel = $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stock_reel'];
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index a316c3cd511..fe9cfd24013 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3458,6 +3458,31 @@ abstract class CommonObject
 		}
 	}
 
+	/**
+	 *  Build thumb
+	 *
+	 *  @param      string	$file           Path file in UTF8 to original file to create thumbs from.
+	 *	@return		void
+	 */
+	function add_thumb($file)
+	{
+		global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini, $quality;
+
+		require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';		// This define also $maxwidthsmall, $quality, ...
+
+		$file_osencoded=dol_osencode($file);
+		if (file_exists($file_osencoded))
+		{
+			// Create small thumbs for company (Ratio is near 16/9)
+	        // Used on logon for example
+	        $imgThumbSmall = vignette($file_osencoded, $maxwidthsmall, $maxheightsmall, '_small', $quality);
+
+	        // Create mini thumbs for company (Ratio is near 16/9)
+	        // Used on menu or for setup page for example
+	        $imgThumbMini = vignette($file_osencoded, $maxwidthmini, $maxheightmini, '_mini', $quality);
+		}
+	}
+
 
 	/* Functions common to commonobject and commonobjectline */
 
@@ -3624,7 +3649,7 @@ abstract class CommonObject
                	$attributeType  = $extrafields->attribute_type[$attributeKey];
                	$attributeSize  = $extrafields->attribute_size[$attributeKey];
                	$attributeLabel = $extrafields->attribute_label[$attributeKey];
-               	$attributeParam = $extrafields->attribute_param[$attributeKey];  
+               	$attributeParam = $extrafields->attribute_param[$attributeKey];
                	switch ($attributeType)
                	{
                		case 'int':
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 777b3633cb5..e5b60f4094c 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -95,6 +95,7 @@ function getServerTimeZoneInt($refgmtdate='now')
     }
     else
     {
+    	$tmp=0;
     	dol_print_error('','PHP version must be 5.3+');
     	/*
         // Method 2 (does not include daylight, not supported by adodb)
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 63c0f6ce433..c1845482eaf 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4542,7 +4542,7 @@ function utf8_check($str)
 
 
 /**
- *      Return an UTF-8 string encoded into OS filesystem encoding. This function is used to define
+ *      Return a string encoded into OS filesystem encoding. This function is used to define
  * 	    value to pass to filesystem PHP functions.
  *
  *      @param	string	$str        String to encode (UTF-8)
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 02686a94f03..4c341e58906 100755
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -138,6 +138,8 @@ class Product extends CommonObject
 	var $stats_commande=array();
 	var $stats_contrat=array();
 	var $stats_facture=array();
+    var $stats_commande_fournisseur=array();
+
 	var $multilangs=array();
 
 	//! Taille de l'image
@@ -3311,31 +3313,6 @@ class Product extends CommonObject
 		else return -1;
 	}
 
-	/**
-	 *  Build thumb
-	 *
-	 *  @param  string	$file           Chemin du fichier d'origine
-	 *  @return	void
-	 */
-	function add_thumb($file)
-	{
-		global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini, $quality;
-
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';		// This define also $maxwidthsmall, $quality, ...
-
-		$file_osencoded=dol_osencode($file);
-		if (file_exists($file_osencoded))
-		{
-			// Create small thumbs for company (Ratio is near 16/9)
-	        // Used on logon for example
-	        $imgThumbSmall = vignette($file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
-
-	        // Create mini thumbs for company (Ratio is near 16/9)
-	        // Used on menu or for setup page for example
-	        $imgThumbMini = vignette($file, $maxwidthmini, $maxheightmini, '_mini', $quality);
-		}
-	}
-
 	/**
 	 *  Affiche la premiere photo du produit
 	 *